From: root <root@cassidy.cs.princeton.edu>
Date: Tue, 30 Nov 2010 10:10:20 +0000 (-0500)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc17~63
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b17648a680454b7e80cae0de207543ccecdf1368;p=build.git

Merge commit 'origin/master'
---

b17648a680454b7e80cae0de207543ccecdf1368