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


Trivial merge