merge of 'ce940581e011db1183eaa6c8d9f0da4779d9a7eb'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 24 Oct 2007 15:56:35 +0000 (15:56 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 24 Oct 2007 15:56:35 +0000 (15:56 +0000)
     and 'f8f0bdb156516a6dce5f3027c090dc2046676e17'


Trivial merge