merge of '0c94e8c9c404fc1fc036b1618c97f2b818f86020'
authorMatthias Hentges <oe@hentges.net>
Sun, 13 May 2007 21:17:32 +0000 (21:17 +0000)
committerMatthias Hentges <oe@hentges.net>
Sun, 13 May 2007 21:17:32 +0000 (21:17 +0000)
     and 'dcc509bc5c3b41b1d93820b5661e105e9d680ac3'


Trivial merge