merge of '2147c8ea9e7d83906d1fea27f954927b41ca4d22'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 19 Nov 2006 17:40:58 +0000 (17:40 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 19 Nov 2006 17:40:58 +0000 (17:40 +0000)
     and 'f19342b2bc5764d1313b089988905bf6d71a95e6'


Trivial merge