merge of '8ba495498c5f5fa451ed9ea2f228a34ae09bf6c8'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 11 Jan 2007 21:17:43 +0000 (21:17 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 11 Jan 2007 21:17:43 +0000 (21:17 +0000)
     and 'a0e24570b0974e5e5baabfb6e68c910d5d833b20'


Trivial merge