[gtk-v4l/f16: 5/5] Merge remote-tracking branch 'origin/master' into f16

[Hans de Goede]

commit 058855b3b95d26eaf2fa3c62c9f099cc0ee161bd
Merge: 529192b 4c0a56c
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed May 9 13:10:36 2012 +0200

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

 ...-gtk-v4l-device-remove-source-on-finalize.patch |   53 ++++++++++++++++++++
 gtk-v4l.spec                                       |   27 ++++++----
 2 files changed, 70 insertions(+), 10 deletions(-)
---