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

Merge commit 'origin/master'
---

fd4dad6a1485c40365ce92eb8f51db16f99c606c