Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 09:53:37 +0000 (11:53 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 09:53:37 +0000 (11:53 +0200)
commit1aefff4959e62b18a56f726b0e1089d4aa75083a
treea78f251f2a7a1fad3e279871c8c3e4ebaab97577
parentb5aa7628bfa26e2cbcce07ffe19af8646e3e3cfb
parent5dc9e76125466be7990187b78000b1df32704312
Merge branch 'master' into 0.11