Merge branch 'master' of pan:/git/madmutt
authorPierre Habouzit <madcoder@debian.org>
Sat, 14 Apr 2007 09:48:10 +0000 (11:48 +0200)
committerPierre Habouzit <madcoder@debian.org>
Sat, 14 Apr 2007 09:48:10 +0000 (11:48 +0200)

Trivial merge