merge of '5e83a11c1979d1a25e15d1870551427de8ffa53a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 3 Nov 2006 00:04:44 +0000 (00:04 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 3 Nov 2006 00:04:44 +0000 (00:04 +0000)
     and '88193d154d85992850b54a623cbba5f64fbe4615'


Trivial merge