Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Jun 2011 15:54:38 +0000 (17:54 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Jun 2011 15:54:38 +0000 (17:54 +0200)
commitc6a3878369c7cd514bc0c2592b25ae4b5ad3e633
treef8c6dedcc514c92b28cf885b103c1204cfe94096
parent7988f4c494554a7c3405028af09ae24d21bd2e55
parent63dbb3b3833148b1dbf7db18ae76c886eb38234f
Merge branch 'master' into 0.11

Conflicts:
configure.ac
win32/common/config.h
win32/common/gstversion.h
configure.ac
libs/gst/base/gstbasesink.c
win32/common/config.h