Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:36:07 +0000 (09:36 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:36:07 +0000 (09:36 +0200)
commitf2a86068a963d4ef51fe422988d842b7fb92ada6
treeaa54f5a6351ff37fff4089c50c8f5b1a4d922d79
parent1d33a3f18edcba8654856bbb817e23806dcec253
Merge branch 'master' into 0.11

Conflicts:
common
configure.ac
gst/colorspace/colorspace.c
gst/colorspace/colorspace.h
gst/colorspace/gstcolorspace.c