From: Baris Metin <bmetin@verivue.com>
Date: Fri, 6 May 2011 14:20:34 +0000 (-0400)
Subject: merge from planetlab/master
X-Git-Tag: 5.0-rc23~55
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=205d6e75db853137859e9d9f153035e81bba7f3a;hp=-c;p=build.git

merge from planetlab/master
---

205d6e75db853137859e9d9f153035e81bba7f3a