Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 3 Oct 2011 08:11:19 +0000 (10:11 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 3 Oct 2011 08:11:19 +0000 (10:11 +0200)
commite787c7a5e27bf19edb52faad10d12eae05314b02
treea8b8c72c75d74801860c2045818471a52fe8957d
parent8778cff7f0c61cd1ff0affe5358017e287e75b79
parent15dc83946755713d8c4e32fd89f7c69330ff6d9e
Merge branch 'master' into 0.11

Conflicts:
ext/pango/gsttextoverlay.c
gst/encoding/gstencodebin.c
gst/encoding/gstencodebin.c