merge of '9e44e4ad0d2aeaa39345101b5c7dad89f0b8e93c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 7 Jul 2007 14:56:52 +0000 (14:56 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 7 Jul 2007 14:56:52 +0000 (14:56 +0000)
     and 'cd0865ab6a23356cda048a3a27c9a131c31b5e09'


Trivial merge