Merge branch 'upstream' into debian
authorRuss Allbery <rra@debian.org>
Mon, 10 Aug 2009 22:27:14 +0000 (15:27 -0700)
committerRuss Allbery <rra@debian.org>
Mon, 10 Aug 2009 22:27:14 +0000 (15:27 -0700)
commitb79e39bd5a081582397a1c372d4d87eb986c5a59
treec804dba9a67e34bcc3b3736c15e7efc2475bb7d7
parent4c68e37a28d6886521f36940a81a508726c628db
parentbe102f2a5fc6f24d45dd9eea63e76581c246fb3f
Merge branch 'upstream' into debian