merge of '298ab982441af9bf434a3f67fd164b26e09ff6b7'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 18 Feb 2007 18:51:39 +0000 (18:51 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 18 Feb 2007 18:51:39 +0000 (18:51 +0000)
     and 'fc57f4efdbe6430b26905dd44e510d7b2ecc81d0'


Trivial merge