From: root <root@cassidy.cs.princeton.edu>
Date: Fri, 23 Jul 2010 11:00:42 +0000 (-0400)
Subject: Merge commit 'origin/master' into 0.5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=refs%2Fheads%2F0.5;p=nodeupdate.git

Merge commit 'origin/master' into 0.5
---

08863d65dcde446654d7f2a785f69c5634e08602