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

[Hans de Goede]

commit dc0fde50f2c59589199d248a29781d0ce6bcd385
Merge: 95926af 8d18df3
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Mar 12 13:15:43 2012 +0100

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

 spice-gtk.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---