merge of '55373d0f032518e68dd4f39df8983ede9ea7659b'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Feb 2008 16:08:02 +0000 (16:08 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Feb 2008 16:08:02 +0000 (16:08 +0000)
     and 'a7d8d33ac7c9103154c98fde0a758a23c99ed439'


Trivial merge