From: Lei Xia <lxia@northwestern.edu>
Date: Thu, 21 Apr 2011 14:41:01 +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=b6d68a6d671dcd403749fcf317482773895b2a0d;p=palacios.releases.git

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

Conflicts:

	palacios/src/devices/nvram.c
---

b6d68a6d671dcd403749fcf317482773895b2a0d