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)
commit3228ab044f30bc93da486c6236d3d8818eedc845
tree6a42ab69078526f382bf1b605269e98fe7cda232
parent57331d6604ba8cb8f1cea88113667fbd02e84a83
parent6dbc26661f6dc3c1d468be596b52a9b2a52c9b96
Merge ... '6219faf600ddbd4c2c3b44a157a842316dfa00d8'
     and '87fdd2d36ae67f50ee78c7ecd82a94682bcfe372'