Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Jun 2011 13:48:19 +0000 (15:48 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Jun 2011 13:48:19 +0000 (15:48 +0200)
commit6b60a27aba71f9f745c0ce3a9bbf0c06df38ee20
tree57dfa074eba35dd40ae2eb0427cd3d385857eac2
parentd93129d8da50d96dbcc3782e36d109d5ab5cfbc2
parent4af771a1a5f12c03eee84cb1933943833f314ea7
Merge branch 'master' into 0.11

Conflicts:
tests/examples/Makefile.am
gst-plugins-base.spec.in
tests/examples/Makefile.am