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

Merge commit 'origin/master'
---

81a6ee3f4ed99abf1d31571bf60e6018274f7cf2