[virt-manager/f16: 6/6] Merge remote-tracking branch 'origin/f17' into f16

[Cole Robinson]

commit 26c20570db7051acc55764e03928520f164e3c80
Merge: d05e217 7e02461
Author: Cole Robinson <crobinso at redhat.com>
Date:   Sun Jul 29 17:14:26 2012 -0400

    Merge remote-tracking branch 'origin/f17' into f16

 .gitignore        |    1 +
 sources           |    2 +-
 virt-manager.spec |   11 +++++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)
---