merge of '46bdfedbe1ecde1685daaddc2f0b8a46939f17c4'
authorMatthias Hentges <oe@hentges.net>
Sat, 30 Jun 2007 18:21:24 +0000 (18:21 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 30 Jun 2007 18:21:24 +0000 (18:21 +0000)
     and 'fd22e92470cbc7bd32d4c2d747a6577afd80516e'


Trivial merge