Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Sun, 3 Jan 2010 21:55:41 +0000 (13:55 -0800)
committerRuss Allbery <rra@debian.org>
Sun, 3 Jan 2010 21:55:41 +0000 (13:55 -0800)
commit0075f0d325972fb9b792ee0203a72f51719a53d9
tree7a083236b771ae78511668419e3dcb0e2c701de8
parent02ea41d5a0164c2da7c679fdc5d6f2e87c78d067
parent98eaf13c843f1db24b8e07255b01d3c5ca1a6fc7
Merge branch 'debian'