merge of '2bd0126d08de7a847d1206078cb5735489c7a443'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:43:51 +0000 (19:43 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:43:51 +0000 (19:43 +0000)
     and '421bc59a69ee9e86be6150500d3b25466a9b730b'


Trivial merge