Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 27 Jan 2012 14:12:25 +0000 (15:12 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 27 Jan 2012 14:12:25 +0000 (15:12 +0100)
commitbf66a410c1141003d9e3e775a1d52b48b09dcdc2
treed3a71298036b5d38d16ec1be44c4e843c7b45357
parent76b7ff8f9967a30543bf8f8217b892c1a3826275
parent629d734e8343abf82e8213f0dc56e2d316fbe086
Merge branch 'master' into 0.11

Conflicts:
gst/adder/gstadder.c