merge of '07e364c1caaec127626ec4949f3b7150cb090b5d'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 19 Jul 2007 07:48:50 +0000 (07:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 19 Jul 2007 07:48:50 +0000 (07:48 +0000)
     and '64298b1eccb4cb0a71eec967d40f9b07077b3e4f'


Trivial merge