merge of '0e37e6d3147e19d5d8fd54b3596f8b3527e4be92'
authorMatthias Hentges <oe@hentges.net>
Sat, 30 Jun 2007 17:56:15 +0000 (17:56 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 30 Jun 2007 17:56:15 +0000 (17:56 +0000)
     and '98d02c14c4d2e08f3fe03f716c9fa5b128b351a4'


Trivial merge