merge of '2c989e7a8173d51a40c417152f5997ab57099663'
authorMichael Krelin <hacker@klever.net>
Tue, 17 Jul 2007 12:52:46 +0000 (12:52 +0000)
committerMichael Krelin <hacker@klever.net>
Tue, 17 Jul 2007 12:52:46 +0000 (12:52 +0000)
     and 'e09ef5f5a677602e791414d3d06ac799a01ee404'


Trivial merge