merge of 'bbfe92716c8516623c7f965f29e1674c2d9b98dc'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 7 Feb 2007 12:41:01 +0000 (12:41 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 7 Feb 2007 12:41:01 +0000 (12:41 +0000)
     and 'fda96508efa311cef118693c03ac023a13f325ca'


Trivial merge