Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 29 Apr 2011 13:49:41 +0000 (15:49 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 29 Apr 2011 13:49:41 +0000 (15:49 +0200)
commit992e3f7c55c42cdc200b275940f50f47d25306fc
tree66d681edeb02e5498489c538f8b87c8047a3196c
parentb121bb0ae99d1acb6d43616c07fc6359d337cb3f
parent865140fb190bb2c18a9f9c6173f8b44ce2823b38
Merge branch 'master' into 0.11

Conflicts:
configure.ac
gst/rtp/gstrtpgstpay.c
configure.ac
ext/jpeg/gstjpegdec.c