Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 14:13:28 +0000 (16:13 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 14:13:28 +0000 (16:13 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge