Added by Christos Stavrakakis about 11 years ago
Merge branch 'release-0.6'
Conflicts: devflow/autopkg.py setup.py version