Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Thu, 26 Jun 2008 00:52:37 +0000 (17:52 -0700)
committerRuss Allbery <rra@debian.org>
Thu, 26 Jun 2008 00:52:37 +0000 (17:52 -0700)
commit53be59464783364356ac1ddbd8fcc0c3613e2384
treedc07539f20506400ba7b979bf0250f831d5ac72b
parent5efcc01db98a70e2221b1d188cb6d3d00a4bc52c
parent988635c2a6fc5272732051d4393c28c617e8aa6a
Merge branch 'debian'