merge of '1cd7dafdf8101519f2632d4e3ab366da93dde56f'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 12 Jan 2007 04:53:51 +0000 (04:53 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 12 Jan 2007 04:53:51 +0000 (04:53 +0000)
     and 'a1094ef17e8382a220ee288571391469f133cdcf'


Trivial merge