Automated DITA crap.
Merge branch 'master' of git.eucalyptus-systems.com:documentation

Conflicts:
	content/en_us/shared/.DS_Store