Merge branch 'geni-v3' into dbsession
[sfa.git] / sfa / planetlab / __init__.py