merge of '70e8c209379710295e2958c7b0c0266f6d40f3a4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 9 Feb 2007 18:46:45 +0000 (18:46 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 9 Feb 2007 18:46:45 +0000 (18:46 +0000)
     and '710640a606169a3c0bcea687566724486473a802'


Trivial merge