From: Marco Yuen <marcoy@cs.princeton.edu>
Date: Tue, 6 Dec 2011 17:22:02 +0000 (-0500)
Subject: Merge branch 'master' into lxc_devel
X-Git-Tag: lxcbuild^0
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=da256268978e70f27e39f26012abd615e26a99c4

Merge branch 'master' into lxc_devel
---

da256268978e70f27e39f26012abd615e26a99c4