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

Merge commit 'origin/master'
---

e2e94d6f88b523f976d6344b2ad5dd888261a5ee