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)
commitf71dc72e069699ebbf544adecc0eafaf1bf5d12d
tree74b9e183470018d2e1f75b377e0d3572a42b6caf
parent9746952dbb562c4d4b013795e3afbcc5116a3f4f
parent32f84db1b6b0284b81c221b9f2f050faec737a10
Merge ... '2c989e7a8173d51a40c417152f5997ab57099663'
     and 'e09ef5f5a677602e791414d3d06ac799a01ee404'