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)
     and 'f1821469be3c8f5081df2188813bc21f7d26b8a8'


Trivial merge