merge of '84106e4ace68399c560ff0c0edfe17511ae7e53e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Jun 2007 22:01:30 +0000 (22:01 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Jun 2007 22:01:30 +0000 (22:01 +0000)
     and 'c5e7d55e50e21d4ce536d855307f0d8afee17693'


Trivial merge