merge of '4406e0f8d2846e24e63874a31dd5fddea1dcdbad'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Oct 2006 13:47:03 +0000 (13:47 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Oct 2006 13:47:03 +0000 (13:47 +0000)
     and '60e987f715a76c533a624e9f7fab56ff0374dd5d'


Trivial merge