add a
Merge branch 'amanda'

Conflicts:
	openstack platform/readme.txt