merge of 'a7a168be197ea3f604669c15d7ec1f26edc2a25c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 20 Jul 2007 23:43:50 +0000 (23:43 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 20 Jul 2007 23:43:50 +0000 (23:43 +0000)
     and 'f7f1a87db91fd74a3e661901b014f70b0719706e'


Trivial merge