merge of '3ca68baf5ab6cfd5309ee998ee3c5e6174ae8ae2'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Dec 2006 09:42:37 +0000 (09:42 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Dec 2006 09:42:37 +0000 (09:42 +0000)
     and 'ded12fd53ea85e06a151ce07a43bccb8c8b1419f'


Trivial merge