Merge commit '796fc6d15de9a45b7b591143898fa3e687417d37' into debian-etch
commit4ccada02cc80e48e248f4b30c3fe2bdf7ec72601
authorPierre Habouzit <madcoder@debian.org>
Mon, 17 Dec 2007 10:52:50 +0000 (17 11:52 +0100)
committerPierre Habouzit <madcoder@debian.org>
Mon, 17 Dec 2007 10:52:50 +0000 (17 11:52 +0100)
tree921bfe7a48f92a667afbea6da3fe18878306d1d0
parent2bd9b9eb64c6b94b562dd0413ad5a6d38b752f59
parent796fc6d15de9a45b7b591143898fa3e687417d37
Merge commit '796fc6d15de9a45b7b591143898fa3e687417d37' into debian-etch

Conflicts:

debian/changelog

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
debian/changelog