Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Sun, 3 Jan 2010 08:17:18 +0000 (00:17 -0800)
committerRuss Allbery <rra@debian.org>
Sun, 3 Jan 2010 08:17:18 +0000 (00:17 -0800)
commit29981e643159b38ee7ead709e34c54f234165144
tree3f6a6553c81466cc10270cebe3158b227272ee4c
parentb2747ac2dc1376df806f9fa94c32394d9cede3b9
parent726f417e6fdde4e5daa8e453fb4d268236d0bbf4
Merge branch 'debian'