[openstack-nova] (7 commits) ...Merge branch 'f17'

[Mark McLoughlin]

Summary of changes:

  cade58e... Fixup permissions on nova config files (*)
  d9530c9... Merge branch 'master' into f17 (*)
  3aab086... Merge branch 'master' into f17 (*)
  e4573f1... Merge branch 'master' into f17 (*)
  a117636... Merge branch 'master' into f17 (*)
  6b2ca1a... Merge branch 'master' into f17 (*)
  22fd3d1... Merge branch 'f17'

(*) This commit already existed in another branch; no separate mail sent