merge of '6fac15e307a3e92d647e9f142ee8341eec839a79'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 12 Jul 2007 12:43:02 +0000 (12:43 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 12 Jul 2007 12:43:02 +0000 (12:43 +0000)
     and 'c1286096ff5c06af943961004df6e2d4107937ea'


Trivial merge