merge of '4b96276978057072a8a8c797151ba5a11e318a1f'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 28 Sep 2006 19:42:14 +0000 (19:42 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 28 Sep 2006 19:42:14 +0000 (19:42 +0000)
     and 'f3852410debd2f0257d5f54d43b81c32351af45f'


Trivial merge