Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel
authorMarco Yuen <marcoy@gmail.com>
Wed, 9 Nov 2011 21:11:05 +0000 (16:11 -0500)
committerMarco Yuen <marcoy@gmail.com>
Wed, 9 Nov 2011 21:11:05 +0000 (16:11 -0500)

Trivial merge