[virt-manager/f17: 5/5] Merge branch 'master' into f17

[Cole Robinson]

commit e6f2dd0925ee1ae0de669be23dd1347c22c763e6
Merge: 08a360a 13b04c0
Author: Cole Robinson <crobinso at redhat.com>
Date:   Mon Jul 9 17:36:31 2012 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	virt-manager.spec

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