From: Lei Xia <lxia@northwestern.edu>
Date: Wed, 3 Nov 2010 20:03:52 +0000 (-0500)
Subject: Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=01d142cec24e5054d8d86e5dba1eff7f5b008c72

Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacios into devel

Conflicts:

	palacios/src/palacios/vmm.c
---

01d142cec24e5054d8d86e5dba1eff7f5b008c72