merge of '3e2ce2d7251972891d2ea2ce5c8e998bbd9d3edb'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 12 Sep 2006 16:06:00 +0000 (16:06 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 12 Sep 2006 16:06:00 +0000 (16:06 +0000)
     and '97610ee42c7e0053a732da81b17cfc1599f73882'


Trivial merge