merge of 'de2cfb4a70d2f5119fd7c0a99f1bb2f139769725'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 21 Oct 2006 10:14:23 +0000 (10:14 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 21 Oct 2006 10:14:23 +0000 (10:14 +0000)
     and 'f42f6c6d5b80fa67d945a4e1e1f55ee27fe004d5'


Trivial merge