merge of '82ecb3e82df006d48634237ef582542384412148'
authorMatthias Hentges <oe@hentges.net>
Fri, 21 Dec 2007 16:54:11 +0000 (16:54 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 21 Dec 2007 16:54:11 +0000 (16:54 +0000)
     and 'e798e962a5670fb7716c8329451079b76eec84c0'


Trivial merge