merge of '47b95f573cdb3823ddb5ef52097dc49bb575bca8'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 8 Sep 2007 23:56:41 +0000 (23:56 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 8 Sep 2007 23:56:41 +0000 (23:56 +0000)
     and '62587daa7e0ad5129712e1e4666b16c8a1971428'


Trivial merge