merge of 'a7f8532d3e089b840d428dbf757e7c0dbe658cb3'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 12 Sep 2006 04:06:35 +0000 (04:06 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 12 Sep 2006 04:06:35 +0000 (04:06 +0000)
     and 'da740e6fe20ac3c17064a8a58061a38e367c7147'


Trivial merge