merge of '443650a5c3bfafa4e922391b71d87087c6b6f355'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 14 Jun 2007 04:51:44 +0000 (04:51 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 14 Jun 2007 04:51:44 +0000 (04:51 +0000)
     and 'a59cc92c385b66015a1eb53d505bf4f139187778'


Trivial merge