merge of '28a2710b7514996588df4fcf0ecdcc35eedc3cc8'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 25 Aug 2006 16:09:28 +0000 (16:09 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 25 Aug 2006 16:09:28 +0000 (16:09 +0000)
     and '8f215c16490fcda28b364721333047263cfcfba9'


Trivial merge