merge of '98c11111632ec1f22cd780bfc86f7f03dc5bfbcb'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Sep 2006 20:27:05 +0000 (20:27 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Sep 2006 20:27:05 +0000 (20:27 +0000)
     and 'f34d4b68a24b0179a8f2bdb573db7a7be933641a'


Trivial merge