merge of '6a408a173b52148c4e6162b1c9d668b6e4a31d8a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 6 Apr 2007 10:25:58 +0000 (10:25 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 6 Apr 2007 10:25:58 +0000 (10:25 +0000)
     and 'f4ff76f0cbdc4e8740cb8490c4c262c0ac868b1a'


Trivial merge