Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 18 Aug 2011 17:37:39 +0000 (19:37 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 18 Aug 2011 17:37:39 +0000 (19:37 +0200)
1  2 
gst/matroska/matroska-demux.c

Simple merge