From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Fri, 19 Feb 2010 17:42:08 +0000 (+0000)
Subject: Merge from trunk.
X-Git-Tag: NodeManager-1.8-24~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a4c294316df5642055aed39b0f54b61bee1c30e3;hp=a4c294316df5642055aed39b0f54b61bee1c30e3;p=nodemanager.git

Merge from trunk.
---