merge of '12fa8ef0c447968799315a8b55e6d534dbf250ab'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 2 May 2007 18:27:18 +0000 (18:27 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 2 May 2007 18:27:18 +0000 (18:27 +0000)
     and 'b896e366f22797c8a8d7c7db63a0236eefe66dc9'


Trivial merge