[gnome-boxes/f19: 5/5] Merge branch 'master' into f19

[Zeeshan Ali]

commit 086c176e1c762fa45c2541f683cb227bcf547e72
Merge: 28b8eb1 b0487f6
Author: Zeeshan Ali (Khattak) <zeeshanak at gnome.org>
Date:   Tue May 14 03:23:21 2013 +0300

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	gnome-boxes.spec
    	sources

 .gitignore       |    1 +
 gnome-boxes.spec |    8 ++++++--
 sources          |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---