merge of '4902c8e53850399e979d4c3c8c0ec1574220d312'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 3 Jul 2007 04:41:09 +0000 (04:41 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 3 Jul 2007 04:41:09 +0000 (04:41 +0000)
     and 'a45766d5a5c2d69b874ae61a15fccc488c0df542'


Trivial merge