merge of '10708d48453a9b828b4902dcbb6d7fabeb08883f'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 22 Apr 2007 21:32:45 +0000 (21:32 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 22 Apr 2007 21:32:45 +0000 (21:32 +0000)
     and '974836a6338171fb70132b4cfd8365173d13f352'


Trivial merge