merge of '8fdd902a1a1f617efa3ad4a034d779faf5219f1e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 19 Nov 2006 02:38:05 +0000 (02:38 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 19 Nov 2006 02:38:05 +0000 (02:38 +0000)
     and 'ee0a10ae2fb6f8e590f42559bdba40c8ebfb3faf'


Trivial merge