merge of 'ce576e9d4a28f2f0f9621405c713b69f7b4ec2aa'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:47:37 +0000 (19:47 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:47:37 +0000 (19:47 +0000)
     and 'e74f8768f9ed214981e2718f7a0da5fb824b5e0d'


Trivial merge