merge of '07e0c923d0acf5689c150b581bff56b5034be4c9'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 4 Jan 2007 20:37:19 +0000 (20:37 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 4 Jan 2007 20:37:19 +0000 (20:37 +0000)
     and 'ce32be70037e3e3d708acffaefd685fda939661f'


Trivial merge