From: Trammell Hudson <thudson@newskysaw.eecs.northwestern.edu>
Date: Wed, 22 Oct 2008 23:27:02 +0000 (-0500)
Subject: Merge branch 'kitten' of ssh://sharedev@localhost/home/sharedev/palacios into kitten
X-Git-Tag: 1.0^2~2^2
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=144cb0d24ea02909221998323c6dff33c3ef2d43

Merge branch 'kitten' of ssh://sharedev@localhost/home/sharedev/palacios into kitten
---

144cb0d24ea02909221998323c6dff33c3ef2d43