[gstreamer-plugins-good/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17

[Hans de Goede]

commit f6c61d77e9bf78920e3d2f5b82705d28c9ddc7a9
Merge: c3d1c3d 7bd0f0f
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Jun 6 15:24:21 2012 +0200

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

 0001-fix-v4l2_munmap.patch    |   58 +++++++++++++++++++++++++++++++++++++++++
 0002-clear_DISCONT_flag.patch |   27 +++++++++++++++++++
 0003-v4l2src-fix.patch        |   28 +++++++++++++++++++
 gstreamer-plugins-good.spec   |   16 ++++++++++-
 4 files changed, 128 insertions(+), 1 deletions(-)
---