Merge branch 'master' into debian debian
authorCharles Clément <caratorn@gmail.com>
Tue, 2 Mar 2010 19:22:59 +0000 (11:22 -0800)
committerCharles Clément <caratorn@gmail.com>
Tue, 2 Mar 2010 19:22:59 +0000 (11:22 -0800)

Trivial merge