merge of '8641efcbdf45be9e288119393a9b475e46f9c515'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 7 Mar 2007 02:48:30 +0000 (02:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 7 Mar 2007 02:48:30 +0000 (02:48 +0000)
     and 'b0f962e1665b2f7f0c836386fa0e1e6e3bf6c376'


Trivial merge