From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Fri, 19 Nov 2010 20:14:39 +0000 (-0500)
Subject: Merge branch 'master' of dhozac@git.planet-lab.org:/git/build
X-Git-Tag: 5.0-rc16~21^2~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d45ae1fde2377febb5d9cca552e0bab9849aa45c;p=build.git

Merge branch 'master' of dhozac@git.planet-lab.org:/git/build
---

d45ae1fde2377febb5d9cca552e0bab9849aa45c