Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 13 Oct 2011 06:53:34 +0000 (08:53 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 13 Oct 2011 06:53:34 +0000 (08:53 +0200)
commit5560d44e7a145c33781ca10b9db5a70cdfd78c0f
treedb8b29c7581deb1e51c7b9e37a7652170154fccd
parent8268a7a20e50ed71bce747f51e77dc023f93dcb7
parentded27cc61a7218fa4c26d75c129a46c01ccb7153
Merge branch 'master' into 0.11
gst/videotestsrc/Makefile.am