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)
commitc5fea3f93c40e562621cae8934d511c0d5772c92
treed9056987d853d5883d148d66827a60f78b664f2c
parent2a78a3010d2d2f34ef3ebf4292a6029a40db6e08
parent7521b597f4dc49d8d168f368f0e7ebaf98a72156
Merge commit '7521b597f4dc49d8d168f368f0e7ebaf98a72156' into 0.11