merge of '9c50dc3092dd50b83e7f4f3e963749eb77fd3caf'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 10 Sep 2006 11:36:36 +0000 (11:36 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 10 Sep 2006 11:36:36 +0000 (11:36 +0000)
     and 'd2fd513e03f9f9b03be24c0ef2ccba24731debcd'


Trivial merge