merge of '2b9491b7874140ea78766c95c3a3adb9165ab7ca'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 6 Apr 2007 11:08:28 +0000 (11:08 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 6 Apr 2007 11:08:28 +0000 (11:08 +0000)
     and '6c57393e9ece050256e18c8dfdee80450071c294'


Trivial merge