Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Tue, 15 Dec 2009 05:40:07 +0000 (21:40 -0800)
committerRuss Allbery <rra@debian.org>
Tue, 15 Dec 2009 05:40:07 +0000 (21:40 -0800)
commitc16a766f2e813f31266bfd9da3a84e76ba082fe6
tree55f32a32d8746acdf391b690128d7f7e0a9b2ee7
parent2a73ef1f138deb613c39c56c2bc1ae5c52f0fc5b
parentf80176eaeada163dd889b361f98093c8168021d6
Merge branch 'debian'