merge of '038ccefff3c8828b23ffdbf20c895724d0bd13d1'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 10 Jan 2007 12:40:19 +0000 (12:40 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 10 Jan 2007 12:40:19 +0000 (12:40 +0000)
     and '12848e56969495d956f712e7c38f7192936d4f39'


Trivial merge