Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 26 Nov 2011 19:51:37 +0000 (19:51 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 26 Nov 2011 19:51:37 +0000 (19:51 +0000)
commitd3264c4b9d60bd37ddd17c956e0218d88f546ddf
tree30cd597de8ce2267f9f99c1cccbdafb9caacd8a0
parent2d7f9cfe92de5fe8faa767d9261d3adb55c7f5e2
parent7eb796d447eb0c9517f180d0c7a747c12dcd2981
Merge remote-tracking branch 'origin/master' into 0.11