[virt-manager/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17

[Cole Robinson]

commit 4acdd3c70bbaaac44e9112ad522c85ec74ccd83e
Merge: e6f2dd0 6801230
Author: Cole Robinson <crobinso at redhat.com>
Date:   Sun Jul 29 17:00:26 2012 -0400

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

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