Merge branch 'master' into bug23712-rra
commit6a2e818277b7993983f9ad975cec580e646c1bdc
authorRuss Allbery <rra@debian.org>
Sun, 10 Apr 2011 18:01:48 +0000 (10 11:01 -0700)
committerRuss Allbery <rra@debian.org>
Sun, 10 Apr 2011 18:01:48 +0000 (10 11:01 -0700)
tree3b9238d8dd0faffe7d6e6b592a33cafda18e7f24
parent6c7592c8a77d410ce314c8095d4fd1a3155fe164
parentf26c91ed1486d2a7952ed0adf1b0632d193dbc67
Merge branch 'master' into bug23712-rra