merge of '6219faf600ddbd4c2c3b44a157a842316dfa00d8'
authorMatthias Hentges <oe@hentges.net>
Mon, 20 Nov 2006 17:32:07 +0000 (17:32 +0000)
committerMatthias Hentges <oe@hentges.net>
Mon, 20 Nov 2006 17:32:07 +0000 (17:32 +0000)
     and '87fdd2d36ae67f50ee78c7ecd82a94682bcfe372'


Trivial merge