Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 17 May 2011 09:27:12 +0000 (11:27 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 17 May 2011 09:27:12 +0000 (11:27 +0200)
commit2df213fe250e1e98e847df9499da23cbc45a3bdf
treea4dc5c863b6fcb1161565fc1e653e80bc48ee7bd
parent318ed07598917ae91b3e80e056614f7a2d0eef8e
parent66016eedc767dd4f0ca80a41e80b18ac2c6cbf1c
Merge branch 'master' into 0.11