merge of '7460b51ee9cc9d17b403416ed3a84895ac86e667'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 25 Feb 2008 00:56:11 +0000 (00:56 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 25 Feb 2008 00:56:11 +0000 (00:56 +0000)
     and 'cad8e5a9c094705cd6895a456eac5da6d41967bb'


Trivial merge