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

[Hans de Goede]

commit e0f33750bf35b8110ab5768ed85b44c96a380197
Merge: 7e8ce00 c3dd8ea
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Mar 14 16:31:21 2012 +0100

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

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