Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 11 Nov 2011 09:39:17 +0000 (10:39 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 11 Nov 2011 09:39:17 +0000 (10:39 +0100)
commitd3f42035fe5f9488a4c7271793a49a3fcd31f8ce
tree72127f3cf9e4af717fbde925fd2f3207c38453a3
parentf8abc7e7340bc0307232298583d12590186f8434
parenta08b3bfa235b51ecf156f159001d4b2573196f2c
Merge branch 'master' into 0.11