merge of '8654baa6db1769cd516400afebdc63c9b19ee633'
authorMichael Krelin <hacker@klever.net>
Wed, 11 Jul 2007 18:51:19 +0000 (18:51 +0000)
committerMichael Krelin <hacker@klever.net>
Wed, 11 Jul 2007 18:51:19 +0000 (18:51 +0000)
commitd029066192d56afa63449a2fc846a51378052d30
treedaf9c54de3933483315c1972e0fc3709e124cc7a
parent75dd520287cba973d751626c17f595f603687dbe
parent77a8758d3dd5dd89b5a0bc32f62f288e71cabca6
Merge ... '8654baa6db1769cd516400afebdc63c9b19ee633'
     and 'f1821469be3c8f5081df2188813bc21f7d26b8a8'