From: Marco Yuen Date: Wed, 14 Dec 2011 17:08:33 +0000 (-0500) Subject: Merge branch 'master' into lxc X-Git-Tag: lxcdevel~2 X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=2a9f9048aae7beabd3d6f594bb6ba243dc0b9de0 Merge branch 'master' into lxc --- 2a9f9048aae7beabd3d6f594bb6ba243dc0b9de0