merge of '79a8be76eb7e634035b02729b67f9179fabb8711'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 10 Jul 2007 19:20:07 +0000 (19:20 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 10 Jul 2007 19:20:07 +0000 (19:20 +0000)
     and '9b3f781313b3e47faa28044336efce829a2c5a40'


Trivial merge