Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Apr 2011 09:20:45 +0000 (11:20 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 25 Apr 2011 09:20:45 +0000 (11:20 +0200)
commit079c152e625b09988da36cbb5ef7ff496274432d
treeea525bb3daad0b95df657528f97641c03ecd74af
parent09d26250454f8ea850d4ea3854382cd40e794954
parentfc31f355eac764d8a9d1518f334df4e2b8e7c407
Merge branch 'master' into 0.11

Conflicts:
gst/videoscale/gstvideoscale.c
gst-libs/gst/tag/gstexiftag.c
gst-libs/gst/tag/tag.h
gst-libs/gst/tag/tags.c
gst/audioresample/gstaudioresample.c
gst/videoscale/gstvideoscale.c
tests/check/elements/videoscale.c