merge of '0daf2d0bb9de41fe64922b7a825b5de36229d3f2'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 6 Jul 2007 10:35:48 +0000 (10:35 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 6 Jul 2007 10:35:48 +0000 (10:35 +0000)
     and 'f3bfa89a401bbe5f20aab265a69e2f5579a7cc15'


Trivial merge