Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 1 Apr 2011 08:47:48 +0000 (10:47 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 1 Apr 2011 08:47:48 +0000 (10:47 +0200)
commit4686e124c85a6db051166a2e59674cb13f79401e
tree0101305f7f977c525ae2a448eb30f8fdc6bb6dc3
parentf6a5b168b2b4168e7c0a8cf7ad1fd6b484580639
parent0221f842af89ffd949aee5d33cddad98e1c3612c
Merge branch 'master' into 0.11