Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 14:27:43 +0000 (16:27 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 14:27:43 +0000 (16:27 +0200)
commit5e8cf7fee7cbe953bb394de6e40fc1715d78cb43
tree8179d8875d01bd862aa5295cd1ff1b1f92d8d7bc
parent6da5841d0a0760e6c2a24ffc72d3c81c48b8844b
parent1aa5b76a6f89b5a57d052d7b5bd777b0d6a11b98
Merge branch 'master' into 0.11

Conflicts:
libs/gst/base/gstbasetransform.c