Merge remote branch 'origin/master' into account
authorStéphane Jacob <sj@m4x.org>
Sun, 28 Feb 2010 23:38:35 +0000 (00:38 +0100)
committerStéphane Jacob <sj@m4x.org>
Sun, 28 Feb 2010 23:38:35 +0000 (00:38 +0100)

Trivial merge