Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 12:29:47 +0000 (13:29 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 28 Feb 2011 12:29:47 +0000 (13:29 +0100)
commitdb5aa9067b866ec0c4e4fecbb3fecb9ae94f58ad
treebb818b3cd40ec1fba2dcc879bdce71273fed06f6
parent0a56b25882299893a0f4ca6538bb724b7e3a4764
parentdd4ec22e7efffe74aa593f90fd87cf999fc7da09
Merge branch 'master' into 0.11