merge of '6a6524b2edba4ee2d273bc4114c24767b9e78a8e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 15 Dec 2007 16:00:43 +0000 (16:00 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 15 Dec 2007 16:00:43 +0000 (16:00 +0000)
     and 'a936edc2be00c83e35e647a91a0923ea2e0ee3ce'


Trivial merge