Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 27 May 2011 11:58:41 +0000 (13:58 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 27 May 2011 11:58:41 +0000 (13:58 +0200)
commit125f6a2fdfa1cd022886cc65618b1a972a1f954b
tree9e0fb5908086e97b0d7667942e1b4b8cd05c44c2
parentd590bce5f7d4a1a24aa61692613471da70d4ca3f
parent2b32faad913c37781cb5647a39b02c8d72857826
Merge branch 'master' into 0.11