merge of '3156c089fb5cb0355b29f37144b9f906f2777e39'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Sep 2006 01:12:49 +0000 (01:12 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Sep 2006 01:12:49 +0000 (01:12 +0000)
     and 'ef8f7e1827f28b6c7ec038ca0a73fc38766ba61f'


Trivial merge