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

Merge commit 'origin/master'
---

49a73e6ebdad8aa263608ac5915b66aa1120e609