merge of '2f0f9f2cfcb50cad0cf024eca65c522c764fe3cf'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 4 Sep 2007 11:46:23 +0000 (11:46 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 4 Sep 2007 11:46:23 +0000 (11:46 +0000)
     and '3fed235384e32b1c9ba26c86ff39b2ffb928fbed'


Trivial merge