merge of '3db7e1f2cd7c90b36753ce7d6f4ed1e6d0835edc'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 16 Jun 2007 09:04:30 +0000 (09:04 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 16 Jun 2007 09:04:30 +0000 (09:04 +0000)
     and '6dae9587e8d44ad9e3ad2b5d663bcbdf934c1670'


Trivial merge