fake merge
authorStefano Zacchiroli <zack@debian.org>
Fri, 21 Dec 2007 01:42:49 +0000 (02:42 +0100)
committerStefano Zacchiroli <zack@debian.org>
Fri, 21 Dec 2007 01:42:49 +0000 (02:42 +0100)

Trivial merge