merge of '41bc7cd136be3eabb67bde38705e491f649cd322'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 11 Sep 2007 16:52:27 +0000 (16:52 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 11 Sep 2007 16:52:27 +0000 (16:52 +0000)
     and 'cb02b3f58dbbe96a4730fcb455585ec97277014a'


Trivial merge