Merge branch 'master' into bug445203-rra
commit13f692f7258df0b182070af489696081d34e25ba
authorRuss Allbery <rra@debian.org>
Tue, 13 Jul 2010 02:19:11 +0000 (12 19:19 -0700)
committerRuss Allbery <rra@debian.org>
Tue, 13 Jul 2010 02:19:11 +0000 (12 19:19 -0700)
treec7152ab21eb9fd549bd3f9b0ff4c720c650a9cb2
parentebee325143bce842efe7791a53a0d33fcf752665
parentc71be33131d1f9790cf368c7840a0388bfde457b
Merge branch 'master' into bug445203-rra