merge of '1726e551b2a715098046dc4b2e147fda03662024'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 3 Nov 2006 00:07:28 +0000 (00:07 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 3 Nov 2006 00:07:28 +0000 (00:07 +0000)
     and 'c3ebb5761100ad6d0b582d5b9a428fc9c2f7721b'


Trivial merge