Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 23:20:58 +0000 (23:20 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 23:20:58 +0000 (23:20 +0000)
commit91bf8e5de689763051448cbacfc2afb39d154fe0
tree061c3f06b16a752b8c357d90c5c4feab809d8335
parente659e1bb3440346a0e245a0ffeff44c93a0392af
Merge remote-tracking branch 'origin/master' into 0.11