merge of 'b34f7bef0e6b11e4d57624cc0e7afecfde12f0bc'
authorMichael Krelin <hacker@klever.net>
Fri, 11 May 2007 09:28:58 +0000 (09:28 +0000)
committerMichael Krelin <hacker@klever.net>
Fri, 11 May 2007 09:28:58 +0000 (09:28 +0000)
     and 'c0ff5cfb65ff533ba57e89d6af3dc28effc19792'


Trivial merge