merge of '2ba712b467ac5c686bf68f2c52317171b00a2a14'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Oct 2007 00:22:03 +0000 (00:22 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Oct 2007 00:22:03 +0000 (00:22 +0000)
     and '52be2ff079be681e1ba27f4d4342036b38404b89'


Trivial merge