merge of '1eda19994e5c81f91c763811b4933f6a997fc501'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Oct 2006 19:21:18 +0000 (19:21 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Oct 2006 19:21:18 +0000 (19:21 +0000)
     and '22493c02a81dce48bd16714e4afc99389ea3fd30'


Trivial merge