From: root <root@cassidy.cs.princeton.edu>
Date: Fri, 9 Jul 2010 17:36:25 +0000 (-0400)
Subject: Merge commit 'origin/master'
X-Git-Tag: 5.0-rc12~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fe0a87a1562997ff4c406cabee276c5a0de73490;p=build.git

Merge commit 'origin/master'
---

fe0a87a1562997ff4c406cabee276c5a0de73490