merge of '9d164624a8276036f03513589d796c605fe94f26'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 13:54:51 +0000 (13:54 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 13:54:51 +0000 (13:54 +0000)
     and 'd278d85d5e8ebba0521212ff089ee6176a08a681'


Trivial merge