From: Lei Xia <lxia@northwestern.edu>
Date: Thu, 9 Jun 2011 17:52:24 +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=b21326f1dd2bcd45a3067169e0a328316312b3f1;p=palacios.releases.git

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

b21326f1dd2bcd45a3067169e0a328316312b3f1