Merge branch 'upstream'
authorRuss Allbery <rra@debian.org>
Tue, 24 Jun 2008 18:23:06 +0000 (11:23 -0700)
committerRuss Allbery <rra@debian.org>
Tue, 24 Jun 2008 18:23:06 +0000 (11:23 -0700)
commit6bf220afaed0c7ebc59159df1d26c8e068b79788
treeed94eb510c52df97c5e5d555087b534b9c6874f0
parent8882f03319e47aeebf63e86eb008b6c4031e699b
parentb73dbb145bd22bdac13573eec347b6aea1ae0e32
Merge branch 'upstream'