merge of '82565cfcf6fec66996d36d4605c34faa7d256c15'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 30 Aug 2006 09:44:22 +0000 (09:44 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 30 Aug 2006 09:44:22 +0000 (09:44 +0000)
     and 'da7632a154580311895110a4f07328ec4c6ed8fe'


Trivial merge