Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Wed, 25 Jun 2008 21:31:02 +0000 (14:31 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 25 Jun 2008 21:31:02 +0000 (14:31 -0700)
commit2a50e2af96b92b6ca913a1298859ae92fe8e2231
treea09b68e79cc53ef846d163f4b0d20593f8b07211
parent1a53ea307759501735ab3d3fbbaa84ce1e503939
parent39dc9c715d2e5f315685db46e94570273150ee1f
Merge branch 'debian'