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)
commit7a1f60ed9ca8a5e890dd3fa0d4ab427a207bf418
tree5ffa0b53b182c37b70915fdffd62ed225224cd4e
parent6cf9c890c9e591339d4f634172fb5a889f94db59
parent40af7a978dfcb1583bb9c53e4f646ba417609d06
Merge branch 'master' into 0.11

Conflicts:
configure.ac