[spice-protocol/f16: 5/5] Merge remote-tracking branch 'origin/master' into f16

[Hans de Goede]

commit ea4ea0b0672ce135230305c37f087a6ecedbfc1a
Merge: 09b0ae4 76668d9
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Jan 16 19:45:16 2012 +0100

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

 .gitignore          |    1 +
 sources             |    2 +-
 spice-protocol.spec |   14 ++++++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)
---