Merge branch 'bug/init'
authorRuss Allbery <rra@debian.org>
Fri, 21 Aug 2009 17:40:26 +0000 (10:40 -0700)
committerRuss Allbery <rra@debian.org>
Fri, 21 Aug 2009 17:40:26 +0000 (10:40 -0700)

Trivial merge