Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel
authorXavi Leon <xleon@ac.upc.edu>
Tue, 6 Dec 2011 17:26:34 +0000 (12:26 -0500)
committerXavi Leon <xleon@ac.upc.edu>
Tue, 6 Dec 2011 17:26:34 +0000 (12:26 -0500)

Trivial merge