merge of '5744cdb7ad43a125c73b2dd57d51ded57a140c60'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 23 Feb 2008 18:33:25 +0000 (18:33 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 23 Feb 2008 18:33:25 +0000 (18:33 +0000)
     and 'be4a9a82ecf6de3dc409f7e421e00f48275630a4'


Trivial merge