Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Mar 2011 12:29:28 +0000 (13:29 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Mar 2011 12:29:28 +0000 (13:29 +0100)
commit357fcbc306edb609b56fc22f8c6d9277c044fa67
tree3101e548d3eba1498dc4d64b31b83313330be0a7
parenta5c1e5fd86bc4cd31095ee0cde3af4cb3685e109
parent8d050d21165cf29e89846c8009f69c55d8d13ac5
Merge branch 'master' into 0.11
configure.ac