Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sat, 26 Feb 2011 14:02:58 +0000 (15:02 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sat, 26 Feb 2011 14:02:58 +0000 (15:02 +0100)
commit62efb84c19414a13cfac17c7f9e6ba312375beed
treec19d48ab548b112f8902079ee61bd23f390402b9
parent8d4421b9c7e14ac14c4db73b6862bf7860e807ca
parent9ccdcda5e68bef768cacb5c27612f8f7b55b0b31
Merge branch 'master' into 0.11

Conflicts:
configure.ac
configure.ac
gst/asfdemux/gstasfdemux.c