Merge branch 'master' into eucalyptus-devel
[sfa.git] / sfa / __init__.py