From: root <root@cassidy.cs.princeton.edu>
Date: Wed, 1 Dec 2010 17:10:29 +0000 (-0500)
Subject: Merge commit 'local_master/master'
X-Git-Tag: 5.0-rc17~59
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3cc53f1b037c30e1d20a49f525f510107894c1ac;p=build.git

Merge commit 'local_master/master'
---

3cc53f1b037c30e1d20a49f525f510107894c1ac