merge of '424d220b7e555d012122f046482db9c9640bf274'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 15 Nov 2006 15:52:53 +0000 (15:52 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 15 Nov 2006 15:52:53 +0000 (15:52 +0000)
     and '99442ff601877aa69eab8fddf98e074d3efa64ee'


Trivial merge