From: Kyle Hale <kch479@newbehemoth.cs.northwestern.edu>
Date: Fri, 29 Apr 2011 22:16:39 +0000 (-0500)
Subject: Merge branch 'devel' of /home-remote/palacios/palacios into devel
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=f08319bfe39e47f1d2e003b48087affa7190c997;p=palacios-OLD.git

Merge branch 'devel' of /home-remote/palacios/palacios into devel

Conflicts:

	Kconfig

merged
---

f08319bfe39e47f1d2e003b48087affa7190c997