Merge branch 'master' into nohook
authorPierre Habouzit <madcoder@debian.org>
Tue, 20 Nov 2007 23:30:22 +0000 (00:30 +0100)
committerPierre Habouzit <madcoder@debian.org>
Tue, 20 Nov 2007 23:30:22 +0000 (00:30 +0100)

Trivial merge