merge of '6cae67d8eb2b6d2a39c35027eca7695c4c5fcea4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 14 Jun 2007 23:02:49 +0000 (23:02 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 14 Jun 2007 23:02:49 +0000 (23:02 +0000)
     and 'f3c17f08880e4dc93bff28ff760b5726d3006671'


Trivial merge