merge of '8a04857f995fdcc1a49071213846b30478958513'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 9 Jan 2007 22:54:22 +0000 (22:54 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 9 Jan 2007 22:54:22 +0000 (22:54 +0000)
     and '955df916e3eec3e7b7ff5a3f79d0751168800677'


Trivial merge