Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 2 Jun 2011 17:26:33 +0000 (19:26 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 2 Jun 2011 17:26:33 +0000 (19:26 +0200)
commit0200e720de7368e64ef5baba34cd6539c28800c3
tree469ba6914e1bc93090144807152e55c7e9f48f68
parent81ebc0a82eeb87b71f5102ac34b99ae8b4fdcd60
parenta9a85bbac1c6bf6807a8ef7280336e339d70d006
Merge branch 'master' into 0.11
gst/typefind/gsttypefindfunctions.c