merge of '2d26bfda6099af9941d0f4615758b4cda0dd358e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 21 Oct 2006 10:24:46 +0000 (10:24 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 21 Oct 2006 10:24:46 +0000 (10:24 +0000)
     and '8335ff00fc9e79bf2087f9bcff293e40f3f0e511'


Trivial merge