merge of '44cb7585cfc81c4b12b9ff644688a3e1230bcb54'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 20:07:27 +0000 (20:07 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 20:07:27 +0000 (20:07 +0000)
     and '90e987889b2038c67f36d277a2292e13551424af'


Trivial merge