merge of '0479e731919623fe441e7b76d00e8c836c573157'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 15 Nov 2006 15:48:32 +0000 (15:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 15 Nov 2006 15:48:32 +0000 (15:48 +0000)
     and 'bcd222bb88d3e217d64a5699a87a9c1253895f1f'


Trivial merge