Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 17:29:20 +0000 (17:29 +0000)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 17:29:20 +0000 (17:29 +0000)
1  2 
configure.ac

diff --cc configure.ac
Simple merge