merge of '866fdd5b1f5c959e08133230487c4695dd958233'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 11 Jul 2007 10:20:33 +0000 (10:20 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 11 Jul 2007 10:20:33 +0000 (10:20 +0000)
     and '8e097cf6a372f389a56b185ce5552dea6d67293f'


Trivial merge