Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 5 Oct 2011 11:32:33 +0000 (13:32 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 5 Oct 2011 11:32:33 +0000 (13:32 +0200)
commitf99001a05d78fd8d1a13c294de369acae9fb5719
treec25363d627c71998afcf6297fc32c4a18af924d9
parent9a7cbf8f0aea7c01ad9563d9a92578fee03d2c50
parent851e34bfb575aa50bbb053d5e5124d6ec9736e66
Merge branch 'master' into 0.11

Conflicts:
ext/amrwbdec/Makefile.am
ext/amrwbdec/amrwbdec.c
ext/amrnb/amrnbdec.c
ext/amrwbdec/Makefile.am
ext/amrwbdec/amrwbdec.c