merge of '20f065690e4d1d9b912ff2b9ea74cb4ec5bfa58e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 2 Dec 2006 15:49:50 +0000 (15:49 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 2 Dec 2006 15:49:50 +0000 (15:49 +0000)
     and '54848140214b3d180243cd747004c124b89af382'


Trivial merge