From: Peter Dinda <pdinda@northwestern.edu>
Date: Wed, 23 May 2012 18:13:25 +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=a1f6a0d482053dd21a03a49e345db4eae8ba9d59;p=palacios.releases.git

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

a1f6a0d482053dd21a03a49e345db4eae8ba9d59