merge of '8405dc5cc23aaf9253c585b2ac4bd2ecc33a4a1a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 1 Sep 2006 17:35:32 +0000 (17:35 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 1 Sep 2006 17:35:32 +0000 (17:35 +0000)
     and 'f881e56a37f68d3a0af64bc320e4ac5c23ffa832'


Trivial merge