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

Merge commit 'origin/master'
---

8082297d6066b0a17d7427df2d311d1612bf31f8