Merge commit 'origin/base'
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 31 May 2009 19:30:31 +0000 (22:30 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 31 May 2009 19:30:31 +0000 (22:30 +0300)

Trivial merge