merge of '7a8b58eb1559ce42d012bca6d3e376d7039ca042'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 29 May 2007 11:05:35 +0000 (11:05 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 29 May 2007 11:05:35 +0000 (11:05 +0000)
     and '9cf7a02e468c0f4c9f50d118cdeb06565eeac2ea'


Trivial merge