merge of '13f44cdbfe324214f1eaf83010654d1baabf59c2'
authorMatthias Hentges <oe@hentges.net>
Fri, 28 Dec 2007 14:42:59 +0000 (14:42 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 28 Dec 2007 14:42:59 +0000 (14:42 +0000)
     and 'be0c074741a0dccdd6fa957ac43f2c44be640046'


Trivial merge