Merge branch 'upstream' into experimental
authorJulien Valroff <julien@kirya.net>
Sun, 17 Jul 2011 11:32:23 +0000 (13:32 +0200)
committerJulien Valroff <julien@kirya.net>
Sun, 17 Jul 2011 11:32:23 +0000 (13:32 +0200)

Trivial merge