merge of '4d572f4cb45451e9b4304e770c4fe56e16f7f058'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Jun 2007 14:48:59 +0000 (14:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Jun 2007 14:48:59 +0000 (14:48 +0000)
     and '957325ccba55323e12c3dd2ce6ff6b49413efef5'


Trivial merge