Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 14:13:56 +0000 (16:13 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 27 Oct 2011 14:13:56 +0000 (16:13 +0200)
commitb22b0ce72d18024ff5ef4a920bf5f1562a60d0e4
tree44062ada764a50736faa0fd584f425bc1ead5091
parentde91ed89cfea575509ffd6816c4147e778465c2e
Merge branch 'master' into 0.11