From: Baris Metin <bmetin@verivue.com>
Date: Mon, 21 Mar 2011 19:01:38 +0000 (-0400)
Subject: Merge branch 'master' into planetmaster
X-Git-Tag: 5.0-rc21~6^2~1^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8350a1cb18365626304f1ce9cc035573a745666e;hp=-c;p=build.git

Merge branch 'master' into planetmaster
---

8350a1cb18365626304f1ce9cc035573a745666e