[cheese/f16: 9/9] Merge remote-tracking branch 'origin/master' into f16

[Hans de Goede]

commit ed0782c353f5b29740073f003f6f8d14566e1ed3
Merge: ff8cab1 d6aca90
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu Sep 29 17:07:51 2011 +0200

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	cheese.spec

 cheese.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---