From: Marco Yuen <marcoy@cs.princeton.edu>
Date: Mon, 7 May 2012 14:27:46 +0000 (-0400)
Subject: Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/nodemanager into lxc_devel
X-Git-Tag: nodemanager-2.1-2~19
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=27cb8f7b65340c134d7d36f5eeef555592f73d31

Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/nodemanager into lxc_devel

Conflicts:
	config_template.xml
---

27cb8f7b65340c134d7d36f5eeef555592f73d31