[spice-gtk/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17

[Hans de Goede]

commit 95926aff239cdcc0f2f801ff3a3cc7fb4c5173af
Merge: f4aaefa 2fbc784
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Mar 9 14:59:05 2012 +0100

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	.gitignore
    	sources
    	spice-gtk.spec

 .gitignore     |    2 +-
 sources        |    2 +-
 spice-gtk.spec |   15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)
---