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

[Pádraig Brady]

Summary of changes:

  e375fbf... update the libguestfs patches ... (*)
  e7abb5e... Merge branch 'master' into el6

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