Merge branch 'bug/init'
authorRuss Allbery <rra@debian.org>
Sat, 23 Aug 2008 23:43:59 +0000 (16:43 -0700)
committerRuss Allbery <rra@debian.org>
Sat, 23 Aug 2008 23:43:59 +0000 (16:43 -0700)

Trivial merge