merge of '1ece995451ce1a3da5c2124442977354e1e6a143'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Jul 2007 22:28:23 +0000 (22:28 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Jul 2007 22:28:23 +0000 (22:28 +0000)
     and '519a89f1a79b55264782142c46e74ce09c0926c4'


Trivial merge