Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 3 Aug 2011 16:58:09 +0000 (18:58 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 3 Aug 2011 16:58:09 +0000 (18:58 +0200)
commit8ab84f0f8aa815a939a1cad221c904c80dd90634
tree2db32373f916e1890e8c99476c6d7f458389ae5d
parent06b391d63d2d462bf550f13c9bca26604c8b55b2
parent19f1c38d4ea16c8c199a1b4cd8d21beef3a70b6c
Merge branch 'master' into 0.11

Conflicts:
common
gst/asfdemux/gstrtpasfdepay.c
gst/asfdemux/gstrtpasfdepay.c