merge of '16ee14a842b8b60161751ee3f1a8963b703977c9'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 9 Jan 2007 18:15:40 +0000 (18:15 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 9 Jan 2007 18:15:40 +0000 (18:15 +0000)
     and '92587fd59457797dd414b12575ca5d07d3407b3f'


Trivial merge