merge of 'a0d908abfd5e081ac8f07c9acfa73a1d71554881'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 18 Jul 2007 00:09:42 +0000 (00:09 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 18 Jul 2007 00:09:42 +0000 (00:09 +0000)
     and 'ecb7ac6569bc1bc246c9cfd0a239ef8b0f14585b'


Trivial merge