merge of '486dfaf50b0883493e2087ab41dbc54b6ba33338'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 21:58:19 +0000 (21:58 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 21:58:19 +0000 (21:58 +0000)
     and '94b9aca1341b3546d0d7977e277bfb7fbc1ba360'


Trivial merge