merge of '266ecf7b63664e3503a2eec2b609cc4d504973a6'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 25 May 2007 08:08:57 +0000 (08:08 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 25 May 2007 08:08:57 +0000 (08:08 +0000)
     and '8189ef74dcc57287fc2af68825813a90e11f098e'


Trivial merge