Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 26 Nov 2011 15:39:40 +0000 (15:39 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 26 Nov 2011 15:39:40 +0000 (15:39 +0000)
commit25b9d6e11476bcabb3d6e33218b5a7673e8ae897
tree5e097396310685ce80e03d312bcab8cf716ba4af
parent7dd07ed7fbbb9a31461c385f0e5cac70a8e1050b
parent28142d9549c0c5667336a26af7923425b44eec09
Merge remote-tracking branch 'origin/master' into 0.11