merge of '31ae6032f4387260877be7f6a21e6b2272aa21af'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 30 Mar 2007 13:40:34 +0000 (13:40 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 30 Mar 2007 13:40:34 +0000 (13:40 +0000)
     and 'fb872b5eddde4be0bc44abec949610d89cadb232'


Trivial merge