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

[Hans de Goede]

commit da2520848b8f2c83ee611c042bc3abe40b32edb2
Merge: e0f3375 ae811a2
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Mar 20 22:27:06 2012 +0100

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

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