Merge branch 'master' into debian
authorCharles Clément <caratorn@gmail.com>
Thu, 18 Feb 2010 00:32:38 +0000 (16:32 -0800)
committerCharles Clément <caratorn@gmail.com>
Thu, 18 Feb 2010 00:32:38 +0000 (16:32 -0800)

Trivial merge