merge of '1f0046e3a3de6767896f50dc65e3f47c7aee755c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 1 May 2007 20:40:54 +0000 (20:40 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 1 May 2007 20:40:54 +0000 (20:40 +0000)
     and '61e6e424777537a2926aad44f2d3b7c26bf2a5a5'


Trivial merge