Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 12:50:50 +0000 (14:50 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 12:50:50 +0000 (14:50 +0200)
commitb66fe258698a3b63f6f1a27ecd5f71243908a5a9
tree8cec49873843e2ef82e675cae4ce025c69811321
parent9573058f5401cd18786f5e5d6660bb2f4aefa113
parent56a16f9f5a67c05f74b8c2ebf386f598280d652e
Merge branch 'master' into 0.11