merge of '597405ebde19640675e0298f9206b90ef981a115'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 16:59:20 +0000 (16:59 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 16:59:20 +0000 (16:59 +0000)
     and 'fe96c9a0cd18409bf382c16dd0dda3f5571ea588'


Trivial merge