merge of '8be6dc26db6d32ecdccf5150788cf139ff19b0c7'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 4 Jan 2007 20:22:09 +0000 (20:22 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 4 Jan 2007 20:22:09 +0000 (20:22 +0000)
     and 'ded62027fb6e6d03cea9aef985bdeb1a5b7adfd2'


Trivial merge