merge of '0d29fdd2446b98bacd9f567cb97f1e7cba3a69b9'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 10 Jan 2007 00:46:11 +0000 (00:46 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 10 Jan 2007 00:46:11 +0000 (00:46 +0000)
     and '3c16e1782478226564fd2d3b64c57dbcf099ed1e'


Trivial merge