Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:24:37 +0000 (12:24 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:24:37 +0000 (12:24 +0100)
commitea30e91443f5062299e201e7ab5b0671d9054dc6
tree675bcab523f993a25ef83cba035d61d943cc5e27
parent4e8791dafd1bc6b72a23550f29398c2a8531329c
Merge branch 'master' into 0.11