merge of '244367946edd2e107d611367e71371627b2c397f'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 12 Jul 2007 23:39:36 +0000 (23:39 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 12 Jul 2007 23:39:36 +0000 (23:39 +0000)
     and '9c38f2ec413f4ee965c2144128a80519d0b9ef66'


Trivial merge