merge of '1caa2b8988bc7d01766f1668314bf16b821b2ff6'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 22 Nov 2007 17:55:24 +0000 (17:55 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 22 Nov 2007 17:55:24 +0000 (17:55 +0000)
     and 'b4fb0e02c0de82a5593a04d6a92a465545d17e15'


Trivial merge