Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Wed, 15 Oct 2008 05:24:30 +0000 (22:24 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 15 Oct 2008 05:24:30 +0000 (22:24 -0700)
commit82f618b0ac081b516add8cc9b4862ce072068ef0
tree2f16ede630ddce0d12761f8366e63ff192c0ca7d
parent712275e19d65c6b68cd9dafeee6139300a0a35fa
parentb771e54db294b1369348947d8562d68382ac76f9
Merge branch 'debian'