Merge branch 'master' of pan:/git/madmutt
authorPierre Habouzit <madcoder@debian.org>
Mon, 11 Dec 2006 09:05:31 +0000 (10:05 +0100)
committerPierre Habouzit <madcoder@debian.org>
Mon, 11 Dec 2006 09:05:31 +0000 (10:05 +0100)

Trivial merge