merge of '19d6e36401459c394e778e2c97b17aece67b9345'
authorMatthias Hentges <oe@hentges.net>
Sat, 3 Mar 2007 19:31:47 +0000 (19:31 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 3 Mar 2007 19:31:47 +0000 (19:31 +0000)
     and '4b82308682e75a00741e659b5a0187889f0edb2d'


Trivial merge