Merge commit 'upstream/0.3_20101226' into experimental
authorJulien Valroff <julien@kirya.net>
Sun, 26 Dec 2010 09:47:34 +0000 (10:47 +0100)
committerJulien Valroff <julien@kirya.net>
Sun, 26 Dec 2010 09:47:34 +0000 (10:47 +0100)

Trivial merge