merge of '6e4ac932ee4d9b1bde2451c96896ac5c4ae396e1'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 8 Sep 2007 10:10:53 +0000 (10:10 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 8 Sep 2007 10:10:53 +0000 (10:10 +0000)
     and 'b6d3200d932c1e277015164a4e83ea009d96872f'


Trivial merge