merge of '66d5a97af3cca6a53cae3f6419a369ffc3a10a6a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 14 Jan 2007 10:06:16 +0000 (10:06 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 14 Jan 2007 10:06:16 +0000 (10:06 +0000)
     and '718ed4ff6804b5e5a066f630b263ec57f36da41f'


Trivial merge