Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/build into lxc_devel
authorMarco Yuen <marcoy@gmail.com>
Mon, 19 Dec 2011 15:23:35 +0000 (10:23 -0500)
committerMarco Yuen <marcoy@gmail.com>
Mon, 19 Dec 2011 15:23:35 +0000 (10:23 -0500)
1  2 
planetlab.mk

diff --cc planetlab.mk
Simple merge