merge of '66ade0070cf3f1ade4dad0f5a9286530409b0feb'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 9 Sep 2007 00:00:20 +0000 (00:00 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 9 Sep 2007 00:00:20 +0000 (00:00 +0000)
     and '71b3a433c7a64638a3d2bdc28a87d962bf4a2c8c'


Trivial merge