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)
commit2ac932fbc9f81644d4d4252e1e7f6abfcd61fcfa
treec050cdcc97c00f3a2a5cde43d9aa1e689f42f525
parentc747ab820640b40c62ed0cc71ca69142b76e0f46
parent776bbf3da1ed47eee452b023d95aad99db7a3577
Merge ... 'b34f7bef0e6b11e4d57624cc0e7afecfde12f0bc'
     and 'c0ff5cfb65ff533ba57e89d6af3dc28effc19792'