merge of '3585034766082dee6be36ed64f840eaeee7eb14e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 12 Sep 2006 16:01:09 +0000 (16:01 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 12 Sep 2006 16:01:09 +0000 (16:01 +0000)
     and 'c2682ec1dd418a696aa5cec3d278f7cfd4386443'


Trivial merge