merge of '0142e29f90cc8908a8014e28ded353006b402400'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 8 Mar 2008 17:24:27 +0000 (17:24 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 8 Mar 2008 17:24:27 +0000 (17:24 +0000)
     and '6d9b16cd18bb40ceb6646604f7f6fbbe385a34b2'


Trivial merge