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

Merge commit 'origin/master'
---

a2e8f1777c0cfdddbbd392a460bd968220bf0042