merge of '55dae195045d9fd52e41e970627ac6ef031ff672'
authorMatthias Hentges <oe@hentges.net>
Sun, 13 May 2007 09:10:11 +0000 (09:10 +0000)
committerMatthias Hentges <oe@hentges.net>
Sun, 13 May 2007 09:10:11 +0000 (09:10 +0000)
     and '8ab707a53cc9313c1dc36a41b86cb0a75624546c'


Trivial merge