merge of '3fd56e976ac5bcaa4320267aaa8b39dceeeebcd4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 25 Dec 2007 18:30:49 +0000 (18:30 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 25 Dec 2007 18:30:49 +0000 (18:30 +0000)
     and 'd29274157cd7d80d66aa37ae4d3ebf85231e594f'


Trivial merge