Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 11:12:51 +0000 (12:12 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 11:12:51 +0000 (12:12 +0100)
Conflicts:
configure.ac

1  2 
configure.ac

diff --cc configure.ac
Simple merge