Merge branch 'lenny'
authorBdale Garbee <bdale@gag.com>
Thu, 20 Aug 2009 06:26:46 +0000 (00:26 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 20 Aug 2009 06:26:46 +0000 (00:26 -0600)
commit79cdc4b6ea8848b21ba4a0e7d2fd3bc401e0bebe
tree2ff9c5d8e5af10309a7dec80528dd3f7916aa9c9
parent8dd55d8556208de3d13380b36122f8a76bd71117
parent2863534a8b974b72a13427a439227d2b2ca61d80
Merge branch 'lenny'

Conflicts:
debian/changelog
debian/rules
debian/changelog
debian/rules