Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:24:37 +0000 (12:24 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:24:37 +0000 (12:24 +0100)
commitd9613e5d82cdd6186af6a3337076b9d5d2e30997
tree519b8c2b5704e2de2ac3a32dfdeaabf27eba1ef8
parentdbdaa23742d5b934fa424c056547f0e179248f2c
parente40ca782789420118854d67443462872dc53e74c
Merge branch 'master' into 0.11