From: Peter Dinda <pdinda@northwestern.edu>
Date: Wed, 3 Nov 2010 19:24:51 +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?a=commitdiff_plain;h=a53aab83afda2e8357720a45dc08a220c61ddfaa;hp=-c;p=palacios.releases.git

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

Conflicts:

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

a53aab83afda2e8357720a45dc08a220c61ddfaa