[openstack-nova/f16] (4 commits) ...Fix up recent patches which don't apply

[Mark McLoughlin]

Summary of changes:

  cf33e03... Move recent patches into git (no functional changes) (*)
  9cf6fbd... Rebase to latest upstream stable/diablo, pulling in ~50 pat (*)
  3868e78... Backport tgtadm off-by-one fix from upstream (#752709) (*)
  be33b4d... Fix up recent patches which don't apply (*)

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