From: Marco Yuen <marcoy@gmail.com>
Date: Fri, 15 Apr 2011 18:12:47 +0000 (-0400)
Subject: Merge branch 'master' into eucalyptus-devel
X-Git-Tag: sfa-1.0-21-ckp1~74
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=5f4f788db1dd59e8a5968e9118ff1feda89389dc

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

5f4f788db1dd59e8a5968e9118ff1feda89389dc