From: Peter Dinda <pdinda@northwestern.edu>
Date: Wed, 19 May 2010 16:19:03 +0000 (-0500)
Subject: Merge branch 'Release-1.2' of ssh://palacios@newskysaw.cs.northwestern.edu//home... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2FRelease-1.2;p=palacios.git

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

de6084de2145f3889a16d8498e5e7d44e96e0162