Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:19:04 +0000 (12:19 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:19:04 +0000 (12:19 +0100)
commitdbdaa23742d5b934fa424c056547f0e179248f2c
tree519b8c2b5704e2de2ac3a32dfdeaabf27eba1ef8
parent0d0444e0fa2c78ea12d3034bb8fa69c2c402895f
parent8529526c54441a40dce4a616acf43fb9cef51400
Merge branch 'master' into 0.11

Conflicts:
gst/colorspace/colorspace.c
ext/resindvd/resindvdsrc.c