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

[Hans de Goede]

commit 553cb7fc38bd346a68dd4e5b107ba55baaefb06d
Merge: 17c36aa ae811a2
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Mar 20 22:26:02 2012 +0100

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

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