merge of '1d7f3627d4fd8579c4f6b167a7e57735a7e43891'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Oct 2006 18:39:16 +0000 (18:39 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Oct 2006 18:39:16 +0000 (18:39 +0000)
     and '506b175408fe92400d1a3bb2485c0dd5b36272e8'


Trivial merge