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)
Conflicts:
configure.ac
docs/plugins/inspect/plugin-gnomevfs.xml

1  2 
gst-libs/gst/pbutils/gstdiscoverer.c

Simple merge