Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 28 Apr 2011 17:28:16 +0000 (19:28 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 28 Apr 2011 17:28:16 +0000 (19:28 +0200)
Conflicts:
configure.ac


Trivial merge