merge of '3492d999d1f0145a240e01f61090931ba2bd1a49'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 20:12:25 +0000 (20:12 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 20:12:25 +0000 (20:12 +0000)
     and 'dd99a3ac99c88fb4ff918a9d103a55f6f2f007f2'


Trivial merge