merge of '67283511b56a658029528bf05ae322e2ad1c5337'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 11 Dec 2007 22:12:58 +0000 (22:12 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 11 Dec 2007 22:12:58 +0000 (22:12 +0000)
     and 'fffc11dbe4c2116a162896535f715b067d2c3b03'


Trivial merge