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)
commite55d0c58c9026a549bc709a1ffcc424beb0f4b8a
treeb6d7e371fff02ff083d7eac286560c3d0aa87a19
parent8aa2d175a51b51339fd84aa60113b8ab0b62e70a
parentaf062ae07d143b7388517fb848d9eb782c6456cb
Merge ... '82ecb3e82df006d48634237ef582542384412148'
     and 'e798e962a5670fb7716c8329451079b76eec84c0'