merge of '9b981e31de2f83c6d7ec9a51a32fc7a6544d46ee'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 23 Nov 2006 18:02:24 +0000 (18:02 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 23 Nov 2006 18:02:24 +0000 (18:02 +0000)
     and 'e4036213db7177a5bac452c75e26c5acaf49f353'


Trivial merge