Merge commit 'upstream/0.2.85+hg33' into experimental
authorJulien Valroff <julien@kirya.net>
Sun, 6 Mar 2011 15:54:29 +0000 (16:54 +0100)
committerJulien Valroff <julien@kirya.net>
Sun, 6 Mar 2011 15:54:29 +0000 (16:54 +0100)

Trivial merge