Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 16:26:06 +0000 (18:26 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 16:26:06 +0000 (18:26 +0200)
commit80427df86285c6255a5d1d8817f738cae222aa8a
tree85d12c57d0795ec80af964b97df917ee8662629b
parent80e0b0b19a8439134c7a63f6f0f0de0e4f4a2abe
parent9e9a1eeeacc4e91af09458fe2156824fcd7f4cd7
Merge branch 'master' into 0.11