[qemu/f18] (2 commits) ...Merge branch 'master' into f18

[Adam Jackson]

Summary of changes:

  9acdac9... Flip Requires: ceph >= foo to Conflicts: ceph < foo, so we  (*)
  308e240... Merge branch 'master' into f18

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