merge of '14b201ae82df51749f503f2abf62d5b4e962bc2f'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 5 Jul 2007 19:41:59 +0000 (19:41 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 5 Jul 2007 19:41:59 +0000 (19:41 +0000)
     and 'f795d68d1af21b0bfa8f21c4a97bdee642fcc48a'


Trivial merge