merge of 'ad39206b5c64117eb68139d32306570306ba9bb7'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 15 Oct 2006 14:12:21 +0000 (14:12 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 15 Oct 2006 14:12:21 +0000 (14:12 +0000)
     and 'dc35203569880bb1b4b6959f2d9d713426b8bc9c'


Trivial merge