merge of '616d95cdf4c10b2406f9d990608ffb47cd9ac60a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 19 Oct 2006 11:13:59 +0000 (11:13 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 19 Oct 2006 11:13:59 +0000 (11:13 +0000)
     and 'e8682916136b366acb4fbc7232707781d8851b88'


Trivial merge