merge of '005e8450d6bc31cd6fba46f5f0464a08d3eb0a17'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 3 Jul 2007 04:35:16 +0000 (04:35 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 3 Jul 2007 04:35:16 +0000 (04:35 +0000)
     and 'b4ae3e3209f986e2f04e385ccdf8f1559f0c510b'


Trivial merge