merge of 'cc4458b919c97c8247a9e3d35ebbed151ab9d407'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 11 Jan 2007 20:57:42 +0000 (20:57 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 11 Jan 2007 20:57:42 +0000 (20:57 +0000)
     and 'f37da99f4dc681eee83fb5d68312cb1b3282999f'


Trivial merge