From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Thu, 15 Jul 2010 19:45:48 +0000 (-0400)
Subject: Merge branch 'master' of dhozac@git.planet-lab.org:/git/build
X-Git-Tag: 5.0-rc13~11
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b82e8f26d3558480942d00b1b2f861d7a6039e8a;p=build.git

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

b82e8f26d3558480942d00b1b2f861d7a6039e8a