merge of '41bd70251806e7dc04496b3cba1b258f8bb9d558'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 3 Jul 2007 14:07:36 +0000 (14:07 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 3 Jul 2007 14:07:36 +0000 (14:07 +0000)
     and 'fbab458bd1cf99cca4f4482a9a55baf74d033ed2'


Trivial merge