Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 14 Jun 2011 13:20:37 +0000 (15:20 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 14 Jun 2011 13:20:37 +0000 (15:20 +0200)
commit8ed2554142c0648c3ddc0602c7d8c9c45924877e
treed606d7f1a055f948e50825d8b081f5b80eaf943a
parent40d567153a304efd35b56f92d195337cbee38496
parent70dd7dd0923131582ba02da2beb9563016d13a8c
Merge branch 'master' into 0.11