Merge commit 'upstream/0.2.85' into experimental
authorJulien Valroff <julien@kirya.net>
Sun, 2 Jan 2011 12:48:47 +0000 (13:48 +0100)
committerJulien Valroff <julien@kirya.net>
Sun, 2 Jan 2011 12:48:47 +0000 (13:48 +0100)

Trivial merge