[openstack-nova/el6] (5 commits) ...Merge branch 'master' into el6

[Pádraig Brady]

Summary of changes:

  9422d8b... maint: don't generate debugging files in update-patches.sh (*)
  045f6d7... maint: ensure the repo is clean before auto merging patches (*)
  f7ad0d8... maint: exclude the changeable git version from patches (*)
  b8158c6... resync patches from master-patches without git version (*)
  87d9e21... Merge branch 'master' into el6

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