merge of '8cde5e5064761c45e322d841a3b3313245cb264a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 18 Feb 2007 09:15:16 +0000 (09:15 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 18 Feb 2007 09:15:16 +0000 (09:15 +0000)
     and 'd6f1925c439f5b0608c0189c89b17a335f9fbbb6'


Trivial merge