merge of '1b9ad8be7ef3071bd7dd0eca9ade2548cb1a11d9'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Sep 2006 23:50:48 +0000 (23:50 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Sep 2006 23:50:48 +0000 (23:50 +0000)
     and 'eed5ae4efe4ce1cb698a47eda73593279e7c3f9a'


Trivial merge