Merge commit '7521b597f4dc49d8d168f368f0e7ebaf98a72156' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 23:20:32 +0000 (23:20 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 23:20:32 +0000 (23:20 +0000)
commit4fa8cfd5c7339a0d7b7a867e068605637d789b07
treee000185c6fcfd9656daf77846e40612110a4ab85
parent274473630c5672d83d0a74aa71002e8551c342a0
parent41359df358e460a73c389d568c4f93303249afd9
Merge commit '7521b597f4dc49d8d168f368f0e7ebaf98a72156' into 0.11