merge of '67dbe8b946b7e61ce8c584272ff315f0a7b698d2'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 20 Jul 2007 20:34:32 +0000 (20:34 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 20 Jul 2007 20:34:32 +0000 (20:34 +0000)
     and '895f25e3b9a12c824a7627b17b4bd30d2affbd1d'


Trivial merge