merge of '6e832d299c428f172ed4117bbcdcc0d79fac1124'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 18 Jul 2007 22:27:20 +0000 (22:27 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 18 Jul 2007 22:27:20 +0000 (22:27 +0000)
     and '8367169481d886ef2488e7436248e2746a2170fc'


Trivial merge