Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 17 May 2011 07:45:04 +0000 (09:45 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 17 May 2011 07:45:04 +0000 (09:45 +0200)
commitdebbea100851ebf0b871f0c3d8f976fc9ecd99a8
tree3b60b2b312aa9bc6c6a881a33265e719f8b26239
parent914b481e4288e9d1220e1e83ac57bdd5957e32d7
parentae4a3a9f2928f6c8b8b80d43d4cab8600d206351
Merge branch 'master' into 0.11