merge of '64c2fdc821dc99c92d5751ee54e721d697c6c950'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 May 2007 12:59:45 +0000 (12:59 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 May 2007 12:59:45 +0000 (12:59 +0000)
     and 'c3da8ddf3a7e9e67a05e625b3e3928d577b784fa'


Trivial merge