From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Wed, 10 Nov 2010 16:15:08 +0000 (-0500)
Subject: Merge branch 'master' of dhozac@git.planet-lab.org:/git/build
X-Git-Tag: 5.0-rc16~31
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c53c3875fc1743c240bdd44d1f730f4aa5beac95;p=build.git

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

c53c3875fc1743c240bdd44d1f730f4aa5beac95