merge of '8ccf578d98540e0fe880015d1158e3f2e2d5fada'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 17:58:00 +0000 (17:58 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 17:58:00 +0000 (17:58 +0000)
     and 'ffc6a1cb8a5c35ab9fdca8add26efc64679665b5'


Trivial merge