merge of '39d1f65c6c8cf68a17022bdb86f69174b4586b1d'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 23 Sep 2006 14:49:31 +0000 (14:49 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 23 Sep 2006 14:49:31 +0000 (14:49 +0000)
     and 'b1648e5bdf9c5d143bff2e5197a4b295ce80262b'


Trivial merge