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

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

64949100879363f0409d02e65502105f1e364a0d