merge of '8e4dedd1739bcbff3b82368fe9e1059f967d5d35'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 27 Oct 2006 01:46:39 +0000 (01:46 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 27 Oct 2006 01:46:39 +0000 (01:46 +0000)
     and 'f20b6d6337e26e8e59ccac846541f64cdde583a0'


Trivial merge