merge of '094d018069f48a7d3f5cca6306a5176b8674800f'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 30 Jan 2008 15:56:37 +0000 (15:56 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 30 Jan 2008 15:56:37 +0000 (15:56 +0000)
     and 'cb67711a6b6864cb1b15727c6292635f892e0eda'


Trivial merge