merge of '36d0c5f8885b2e835ebb7e89958f2ba06c2b2f2e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 20 Nov 2006 22:23:27 +0000 (22:23 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 20 Nov 2006 22:23:27 +0000 (22:23 +0000)
     and 'a245c6986b9923650003dbb564c2fb2cdf73124a'


Trivial merge