merge of '0eb06e644668e069af094409f30e23fcd3d9c1dc'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 18:22:38 +0000 (18:22 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 18:22:38 +0000 (18:22 +0000)
     and 'f9f12a308eb181f774d74489bbf74aab0dbdb33b'


Trivial merge