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

[Hans de Goede]

commit 7e8ce00cd7f4cf49abb4e5898b8e7a65193025fb
Merge: 5b1cc16 8d18df3
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Mar 12 13:17:17 2012 +0100

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

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