merge of 'dcad4c29f9b9e4345ed6d8ade8f43504cde65b34'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 17:08:06 +0000 (17:08 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 17:08:06 +0000 (17:08 +0000)
     and 'e6858d7efc8dabfe5569175c65dc71b0e94e25c6'


Trivial merge