Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 10 Nov 2011 11:14:19 +0000 (12:14 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 10 Nov 2011 11:14:19 +0000 (12:14 +0100)
commit59b4bcd27e8f3b40a7369029812ff5d7fe079ead
tree26d6aeedfde2986d63ab28888c02cd0672993498
parent85469512223d95fd80fba5d24facb6e57e6f759a
parentc7db5db63224bdb0ae09c4980ad96488e9e2b9bc
Merge branch 'master' into 0.11