merge of '1a0fa55312a6e8e3a571b70885c58ac23f9ee663'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 27 Aug 2006 22:57:46 +0000 (22:57 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 27 Aug 2006 22:57:46 +0000 (22:57 +0000)
     and 'b04a3501f1bd7897a8ed9eed9f0796e1e96dd1bf'


Trivial merge