From: root <root@cassidy.cs.princeton.edu>
Date: Thu, 2 Dec 2010 13:20:29 +0000 (-0500)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc17~54
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a7703544e32e97a77c70b79dbb7555d6820db211;p=build.git

Merge commit 'origin/master'
---

a7703544e32e97a77c70b79dbb7555d6820db211