merge of '8661dad7046a2fab56c71e99e952657a1a4ab326'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 27 Oct 2006 00:53:21 +0000 (00:53 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 27 Oct 2006 00:53:21 +0000 (00:53 +0000)
     and 'ec573d09e6df58156d74acbe74e02255749b7af5'


Trivial merge