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

[Hans de Goede]

commit 37f1b24f2e612ef9d51c66fb88a5559ba6e2a73f
Merge: 516cfbb 44c79b6
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Jan 23 18:06:10 2012 +0100

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	.gitignore
    	sources
    	spice.spec

 .gitignore              |    1 +
 sources                 |    2 +-
 spice-xpi-client-spicec |    6 ++++++
 spice.spec              |   42 +++++++++++++++++++++++++++++++-----------
 4 files changed, 39 insertions(+), 12 deletions(-)
---