Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 13 Nov 2011 13:23:09 +0000 (13:23 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 13 Nov 2011 13:23:09 +0000 (13:23 +0000)
commitbb18ca7fa47c69edbed53d6cab7f4635aac8e297
tree9ccb2384798847acbbf6a8b32f76a22458c473af
parentae5e44bfb36ec99382081379952e004d335f4a26
parentc0d5857cd997ee8d3e6674bf92f7ad76c2c2de8e
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
tools/gst-inspect.c
Android.mk
gst/gstelementfactory.c
gst/gstplugin.c
libs/gst/controller/gstinterpolationcontrolsource.c
tools/gst-inspect.c