merge of '34210cbb1abcf24cee31bdf8e8ba63f998c30e1d'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Sep 2006 08:09:51 +0000 (08:09 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Sep 2006 08:09:51 +0000 (08:09 +0000)
     and '78bcf1f7c1dacd879c13e6220422420e63c82aed'


Trivial merge