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

[Hans de Goede]

commit 5b1cc165df93ec743267cb51cf31bd31872af388
Merge: 8e8d76a 2fbc784
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Mar 9 14:59:59 2012 +0100

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

 .gitignore     |    1 +
 sources        |    2 +-
 spice-gtk.spec |   12 ++++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)
---