Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Feb 2012 09:06:16 +0000 (10:06 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Feb 2012 09:06:16 +0000 (10:06 +0100)
commita2bb20e522268780340c445f781b2b0c89527e2f
treea7fc098dc7bb4b250c34bc03380daa442c7d56aa
parent0dbfad52d9311622985f4b7dd947e69376fc8b36
Merge branch 'master' into 0.11

Conflicts:
gst/colorspace/colorspace.c