Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Sep 2011 20:31:17 +0000 (22:31 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Sep 2011 20:31:17 +0000 (22:31 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge