merge of '5f91da5c49d84ece0c2aa5ee0abc2db5fed0de5c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 09:35:59 +0000 (09:35 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 09:35:59 +0000 (09:35 +0000)
     and 'e316470a647d6066a45ad86ba177092678b4d89b'


Trivial merge