merge of '3d0230efac5fabe1406f43ab6c934c0589c097c4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 20 Jun 2007 18:40:29 +0000 (18:40 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 20 Jun 2007 18:40:29 +0000 (18:40 +0000)
     and 'c664220a4c8dabbd9e38f326462046a367cad18e'


Trivial merge