From: root <root@cassidy.cs.princeton.edu>
Date: Thu, 16 Dec 2010 22:50:20 +0000 (-0500)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc18~162
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4c30968c639dbd509991d73303c030b46c1af157;p=build.git

Merge commit 'origin/master'
---

4c30968c639dbd509991d73303c030b46c1af157