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

[Hans de Goede]

commit 17c36aa28852e7afd762d87288faeedb795db4d1
Merge: dc0fde5 c3dd8ea
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Mar 14 16:30:03 2012 +0100

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

 ...eck-for-existing-usb-channels-after-libus.patch |  154 ++++++++++++++++++++
 spice-gtk.spec                                     |   11 ++-
 2 files changed, 164 insertions(+), 1 deletions(-)
---