merge of '66551f8550ad2253c8034a5f044ff55b9feb2b58'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 17:32:17 +0000 (17:32 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 17:32:17 +0000 (17:32 +0000)
     and '750215559f3cd57e976011193cc7b72d50be5aba'


Trivial merge