merge of '6658e5575b2499bf86ecb1cd82850d65501856b4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 26 Sep 2007 00:10:17 +0000 (00:10 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 26 Sep 2007 00:10:17 +0000 (00:10 +0000)
     and 'ad34928597dd3958fba76d0d375a901a6f371138'


Trivial merge