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)
commit5fe9bcd989cdfb4d540baab90cad32c5b4873752
tree794337828542c8eab37ce5048cb259743c105c2c
parent2243adffa128c6f508b0926ee00bfb1b18fead5e
parent11ac49e6c4d6a90b8ef55c66772d5a217de95d94
Merge branch 'master' into 0.11

Conflicts:
configure.ac
gst/gstbus.c