merge of '0113d92ca6c2c5d48a385cf069c1ce5e2131b90c'
authorMatthias Hentges <oe@hentges.net>
Sat, 17 Mar 2007 01:05:27 +0000 (01:05 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 17 Mar 2007 01:05:27 +0000 (01:05 +0000)
     and '8fbc5385f32ca0012d8473a8bda25646a7a49dfc'


Trivial merge