merge of 'cc77b9d135248dc8b58b6894e8ed95dcbd474752'
authorMatthias Hentges <oe@hentges.net>
Wed, 6 Jun 2007 01:10:51 +0000 (01:10 +0000)
committerMatthias Hentges <oe@hentges.net>
Wed, 6 Jun 2007 01:10:51 +0000 (01:10 +0000)
     and 'd2a5a60fd238d5b9bfaaaff0779e6127ad4454da'


Trivial merge