merge of '0ff974ee10065a85ea694230ce4da699e5a953b9'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 18 Jun 2007 14:41:31 +0000 (14:41 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 18 Jun 2007 14:41:31 +0000 (14:41 +0000)
     and '9a2e67d25c144816aef508c89a610ad38406853d'


Trivial merge