merge of 'c061aa64ee8dccfbed5fd12dc83cc6ec172dde58'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 19 Jul 2007 18:07:10 +0000 (18:07 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 19 Jul 2007 18:07:10 +0000 (18:07 +0000)
     and 'e3a9ffcabff170015568075793b602d5afb73e11'


Trivial merge