Merge branch 'master' into 0.11-fdo
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 30 Mar 2011 17:58:52 +0000 (19:58 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 30 Mar 2011 17:58:52 +0000 (19:58 +0200)
commit7a62d32a0757c0d66a29ab32c775d324c3ff8b11
tree4c3cf9834e6066c75a119c79822a01f93adf45b4
parent7cae289036193f3fad5dc5423e7adbc8604b8c2a
parent8db570f48cf129ae28e36bab58729017d7577a78
Merge branch 'master' into 0.11-fdo

Conflicts:
docs/plugins/gstreamer-plugins.hierarchy
gst/gstelement.c
docs/plugins/gstreamer-plugins.hierarchy
gst/gstelement.c
plugins/elements/gstmultiqueue.c
tests/check/Makefile.am
tests/check/elements/multiqueue.c