Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:29:04 +0000 (10:29 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:29:04 +0000 (10:29 +0100)
commitf1b07c580ebec40d7f3028337bdabeaecb331c6f
tree040e2bc3376ad2f7dc1b40d0b359b44e1eeefd63
parent289d2d62ba2b57caec0dae0f39926e37ef1b0172
parentcf69ce1df660235c6c8013241311ce79782274f1
Merge branch 'master' into 0.11

Conflicts:
common
configure.ac
common
configure.ac
libs/gst/base/gstadapter.c