merge of '554d1c13766299b9a5323f5553876072c65d7ff3'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 22:37:44 +0000 (22:37 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 22:37:44 +0000 (22:37 +0000)
     and 'e25c5e38674da9988b268e6af89a90ecbbe1dac6'


Trivial merge