From: Marco Yuen <marcoy@gmail.com>
Date: Wed, 6 Jul 2011 18:20:59 +0000 (-0400)
Subject: Merge branch 'master' into eucalyptus-devel
X-Git-Tag: sfa-1.0-28~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b9e582564804f4538056758e86dee84c8fc5e6f5;p=sfa.git

Merge branch 'master' into eucalyptus-devel
---

b9e582564804f4538056758e86dee84c8fc5e6f5