From: root <root@cassidy.cs.princeton.edu>
Date: Sun, 24 Oct 2010 20:12:42 +0000 (-0400)
Subject: Merge commit 'local_master/myplc-0_4-branch' into myplc-0_4-branch
X-Git-Url: http://git.onelab.eu/?p=nodeupdate.git;a=commitdiff_plain;h=a5255e676664f883c11ed8d119203fa169e01685

Merge commit 'local_master/myplc-0_4-branch' into myplc-0_4-branch
---

a5255e676664f883c11ed8d119203fa169e01685