merge of '5ea326f3b26f2123d331eace3ce101ac2983534e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 22 Dec 2006 09:44:03 +0000 (09:44 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 22 Dec 2006 09:44:03 +0000 (09:44 +0000)
     and 'fd22e946abe117169eb2505f30a12a2aa70f1a71'


Trivial merge