From: root <root@cassidy.cs.princeton.edu>
Date: Wed, 1 Dec 2010 17:10:28 +0000 (-0500)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc17~60
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b2c7358742ac3c702e3b20ccb1254d5dc7fd0da4;p=build.git

Merge commit 'origin/master'
---

b2c7358742ac3c702e3b20ccb1254d5dc7fd0da4