merge of '5369901ff675d4c926113d856ce9da4c8c12fed0'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 13 Oct 2006 10:17:25 +0000 (10:17 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 13 Oct 2006 10:17:25 +0000 (10:17 +0000)
     and '71b1cbe678cd91cfaf67632c7cbe2a37cb593a48'


Trivial merge