merge of '69bc603f5439800c81d9c68986a421da084e4efd'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 30 Aug 2006 09:36:43 +0000 (09:36 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 30 Aug 2006 09:36:43 +0000 (09:36 +0000)
     and 'def4216e697c6f92ad597789b7e520758364dae3'


Trivial merge