Merge "Add user_data_format"
authorJenkins <jenkins@review.openstack.org>
Mon, 28 Jul 2014 08:42:19 +0000 (08:42 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 28 Jul 2014 08:42:19 +0000 (08:42 +0000)

Trivial merge