Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 8 Oct 2011 14:34:45 +0000 (15:34 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 8 Oct 2011 14:34:45 +0000 (15:34 +0100)
commit92b920f5d556bb776fc854b9e8c7df45d59ed0b6
treeaa8ee05960b575b99025ea383f945a2a20cceca9
parent0546e5881d1ec7137c71d35247729e28c1a4ab66
parent5689ceac13ce0c2db37c7aff66341906077a293f
Merge remote-tracking branch 'origin/master' into 0.11