Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 17 May 2011 07:40:38 +0000 (09:40 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 17 May 2011 07:43:21 +0000 (09:43 +0200)
commite34c26b509258c6407fc5d00ca6cfbd43da05e82
tree8583418e14a1e87f2298e8857d7498b7729f2898
parentca0069595f6dffecfa8c7b9596ba735382c058eb
parentb4dea3a1d3133b9a94ffdaba5122a59cdae9cf9c
Merge branch 'master' into 0.11

Conflicts:
win32/common/libgstreamer.def
docs/gst/gstreamer-sections.txt
gst/gstcaps.c
gst/gststructure.c
gst/gststructure.h
win32/common/libgstreamer.def