Merge branch 'debian'
authorRuss Allbery <rra@debian.org>
Thu, 13 May 2010 16:52:59 +0000 (09:52 -0700)
committerRuss Allbery <rra@debian.org>
Thu, 13 May 2010 16:52:59 +0000 (09:52 -0700)
commit964f8b5827c8d86529bcae1219c4c9b80e7d8de1
treeb05641c26294b5970457f2b7691d3a149ddd810a
parentfe009e3f4c17bd9bcbbf5686a99bd2cad314c26a
parent5dec9e5eb066181c8900c333ba3996370558ea07
Merge branch 'debian'