[gstreamer-plugins-bad-free/f17: 11/11] Merge remote-tracking branch 'origin/master' into f17

[Hans de Goede]

commit 0513b9e3aa034edfb9c84d7e7af6060d2ceb241a
Merge: b021d66 ef2d6c3
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Jun 8 18:38:16 2012 +0200

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	gstreamer-plugins-bad-free.spec

 ...rabin-Fix-spelling-error-in-debug-logging.patch |   26 ++++
 ...dd-a-camerabin_create_view_finder_caps-he.patch |  121 ++++++++++++++++++++
 ...dd-gst_camerabin_get_video_source_propert.patch |   97 ++++++++++++++++
 ...et-src_filter-and-zoom_src_filter-caps-wh.patch |   74 ++++++++++++
 gstreamer-plugins-bad-free.spec                    |   60 +++++++---
 vp8enc-bitrate-fix.patch                           |   23 ++++
 6 files changed, 383 insertions(+), 18 deletions(-)
---