merge of '3c66a0a9825efc80588849fe82b88738551477fc'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Jul 2007 11:40:30 +0000 (11:40 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Jul 2007 11:40:30 +0000 (11:40 +0000)
     and '8b45f67b4f000fb3882668dfd0814434f578be65'


Trivial merge