Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 4 Apr 2011 10:24:03 +0000 (12:24 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 4 Apr 2011 10:24:03 +0000 (12:24 +0200)
commitb304fff5515840be482ce1a4008f4fe7ba76e82a
treeaf8f3b2d21fab38fedaa3f99fb1aacdc0bc75f7c
parent4345d10577d483536ff33a55dd252fbe23870cea
parentb46a8494993261b9c88fc6a21055ee8a9a5365a6
Merge branch 'master' into 0.11