merge of '24d82a2b5a32fe5d1e0f3aa0049aaa50eb5ba7bc'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 7 Feb 2007 12:09:02 +0000 (12:09 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 7 Feb 2007 12:09:02 +0000 (12:09 +0000)
     and '8b1c98ab8741ba8300cdf786026d984af16882f6'


Trivial merge