Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sun, 10 Jul 2011 11:49:14 +0000 (13:49 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sun, 10 Jul 2011 11:49:14 +0000 (13:49 +0200)
1  2 
ext/ogg/gstoggmux.c
gst/typefind/gsttypefindfunctions.c

Simple merge
Simple merge