From: Marco Yuen <marcoy@cs.princeton.edu>
Date: Mon, 16 Jan 2012 16:29:54 +0000 (-0500)
Subject: Merge branch 'master' into lxc_devel
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=72ddbb5e471871aa1fb8f241fe13a672b224748e

Merge branch 'master' into lxc_devel
---

72ddbb5e471871aa1fb8f241fe13a672b224748e