merge of '276c77797a1716ee61af4bf34250ceec1c482bcd'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 18 Nov 2006 05:02:26 +0000 (05:02 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 18 Nov 2006 05:02:26 +0000 (05:02 +0000)
     and '6402e4658cf4796b8f92d0b817add4df9bd7aaf2'


Trivial merge