Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 31 Oct 2011 14:51:32 +0000 (14:51 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 31 Oct 2011 14:51:32 +0000 (14:51 +0000)
commit9a478090a2190f1ca89bd37db01567857d17aff4
tree44062ada764a50736faa0fd584f425bc1ead5091
parentb22b0ce72d18024ff5ef4a920bf5f1562a60d0e4
Merge remote-tracking branch 'origin/master' into 0.11