Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Jun 2011 15:57:56 +0000 (17:57 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Jun 2011 15:57:56 +0000 (17:57 +0200)
commitf372ec1f548e417c5baa2d122b54877f983da7d8
tree4b08040be6d24777ca084e9ed0ce6ab424eed36f
parent2732300adcb8681e2ce2a101481a83eb5d99d16f
parent74a756350f92b6d89ff59648c21a7cbc7e558b33
Merge branch 'master' into 0.11

Conflicts:
configure.ac
docs/plugins/inspect/plugin-gnomevfs.xml
gst-libs/gst/pbutils/gstdiscoverer.c