merge of '3a4c124aa9688e101e4d5547ad18d4512d45e47b'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:40:30 +0000 (19:40 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:40:30 +0000 (19:40 +0000)
     and '4388a6b99de31cf7e9bb5af3a124ae80c52e796c'


Trivial merge