Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 3 May 2011 07:41:48 +0000 (09:41 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 3 May 2011 07:42:58 +0000 (09:42 +0200)
Conflicts:
configure.ac
gst/gstbus.c


Trivial merge