merge of '169f0a9eb85b9f29ecde9111e22938b3acc6a71d'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 19 Dec 2007 10:09:49 +0000 (10:09 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 19 Dec 2007 10:09:49 +0000 (10:09 +0000)
     and '71ca4b99ae3c9b849f6f910a221fa3cd4e13d0d6'


Trivial merge