merge of '4d7d106ba858e881e70ced98ec75da0a78a4b634'
authorMatthias Hentges <oe@hentges.net>
Mon, 7 Jan 2008 10:57:34 +0000 (10:57 +0000)
committerMatthias Hentges <oe@hentges.net>
Mon, 7 Jan 2008 10:57:34 +0000 (10:57 +0000)
     and 'a9234837102809b3f5f82abc11e373c14c1c638b'


Trivial merge