merge of '3948c8054b50f67afee06a66abbab4a35915d297'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 30 Nov 2007 14:14:53 +0000 (14:14 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 30 Nov 2007 14:14:53 +0000 (14:14 +0000)
     and 'cefef520b1840df3899cd9fc5a4fc3cb9faa38ce'


Trivial merge