merge of '0f42a8d653cc37dd474c367e444fab263968257a'
authorMichael Krelin <hacker@klever.net>
Sat, 16 Jun 2007 20:52:55 +0000 (20:52 +0000)
committerMichael Krelin <hacker@klever.net>
Sat, 16 Jun 2007 20:52:55 +0000 (20:52 +0000)
commit19132d0835d2ffbf17823da5f868a3181dd48d9e
tree4b23e96c8700a91517571da2412e27ab5a958fdd
parent92e5511f8e72ff3502c99d10e68d01c2d380add4
parentbbb314fd664b8113b69b39d933e4c6f99d6baad4
Merge ... '0f42a8d653cc37dd474c367e444fab263968257a'
     and 'b6e86a37731576ee6fdcf7532f2acbe80763248d'