merge of '319ad827498d2f67716b4a09957df34bc0ecd562'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 27 Oct 2006 01:08:18 +0000 (01:08 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 27 Oct 2006 01:08:18 +0000 (01:08 +0000)
     and 'b964132dbae4a8cacc917a415790818929f68c69'


Trivial merge