Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 3 Jun 2011 11:31:42 +0000 (13:31 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 3 Jun 2011 11:31:42 +0000 (13:31 +0200)
commitb1aec14767967635034179797c4c5c200a1c40d8
treeee7f5eaf5b77f5f2e016fde12123d383e0b37d45
parentc74443b34711121a382e26995e9785de5d02a5cd
parent407b77740ea31543b8cbe8b0edf516ea9abbe2d8
Merge branch 'master' into 0.11

Conflicts:
ext/theora/gsttheoraenc.c
ext/theora/gsttheoraenc.c