merge of '65fefd8b14862b0291239d37729964b98069c038'
authorMatthias Hentges <oe@hentges.net>
Thu, 27 Dec 2007 21:37:31 +0000 (21:37 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 27 Dec 2007 21:37:31 +0000 (21:37 +0000)
     and 'fbb56d5a76093891efdc7abc682059fd0436d4be'


Trivial merge