merge of '70b4e64ac7a19c85aafe36376208542257f06435'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 21 Feb 2007 14:43:36 +0000 (14:43 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 21 Feb 2007 14:43:36 +0000 (14:43 +0000)
     and 'f77e00e9693f39979c7e8a37a8db6dc793fd1832'


Trivial merge