merge of 'b042caec894575c0d01a2647dd795e6c60ea7253'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Oct 2006 18:38:19 +0000 (18:38 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Oct 2006 18:38:19 +0000 (18:38 +0000)
     and 'eafe4a1f67153de6cfe4564951e34ab79519bef8'


Trivial merge