merge of '25ebcc211850fcca65a380b4725ec80c30b6049d'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 24 Feb 2007 23:36:41 +0000 (23:36 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 24 Feb 2007 23:36:41 +0000 (23:36 +0000)
     and 'b68accb54821f930c21e6561f56860928a40bad2'


Trivial merge