Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Sun, 24 Aug 2008 00:17:00 +0000 (17:17 -0700)
committerRuss Allbery <rra@debian.org>
Sun, 24 Aug 2008 00:17:00 +0000 (17:17 -0700)
commit436af8b866e91252d2f8c6ffb64cf2e29d2fd590
tree91d2a9f4d3c6b02857813d62cf740e68cde3c286
parentd9d65248fbe251c4bbe8dfd25658698bb96faec1
parent7fd63aa37a313d4ea40c45f83f5f5cf8f38272d5
Merge branch 'debian'