Merge commit 'origin/1.0-bugfix'
authorRémi Denis-Courmont <remi@remlab.net>
Thu, 14 May 2009 15:54:17 +0000 (18:54 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Thu, 14 May 2009 15:54:17 +0000 (18:54 +0300)

Trivial merge