merge of '954be7b7073966385f751b525d692dfa6eb1a918'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Jun 2007 18:12:56 +0000 (18:12 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 11 Jun 2007 18:12:56 +0000 (18:12 +0000)
     and 'fbec129540c1d0a2c22d3c5bd955a17e6c9b9770'


Trivial merge