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

Merge commit 'origin/master'
---

1c1bee743ed5b56e3c44345c0d93268d229875ef