Merge branch 'master' into debian
authorCharles Clément <caratorn@gmail.com>
Sat, 20 Feb 2010 23:33:41 +0000 (15:33 -0800)
committerCharles Clément <caratorn@gmail.com>
Sat, 20 Feb 2010 23:33:41 +0000 (15:33 -0800)

Trivial merge