merge of '600d1cf340e547dc05390af836d52bb279ef2e25'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 28 Sep 2006 17:53:19 +0000 (17:53 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 28 Sep 2006 17:53:19 +0000 (17:53 +0000)
     and 'd3f331b70e95906af0d505b077734594ec371fee'


Trivial merge