Merge branch 'master' into debian
authorCharles Clément <caratorn@gmail.com>
Wed, 17 Feb 2010 23:55:56 +0000 (15:55 -0800)
committerCharles Clément <caratorn@gmail.com>
Wed, 17 Feb 2010 23:55:56 +0000 (15:55 -0800)

Trivial merge