Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:31:57 +0000 (10:31 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:31:57 +0000 (10:31 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge