merge of 'bb1bb675997832a7601e5748309247add662cc9a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Jun 2007 01:15:34 +0000 (01:15 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Jun 2007 01:15:34 +0000 (01:15 +0000)
     and 'd247b65521d61fba926d1749aacaf2ae4bc82f02'


Trivial merge