merge of '5a8c2a2330d46aac768d52f881486817fce472bb'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 15 Feb 2008 16:39:10 +0000 (16:39 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 15 Feb 2008 16:39:10 +0000 (16:39 +0000)
     and '932ef509383c7f695dd4e96f7c37401a0553965a'


Trivial merge