merge of '207a5b2c50c00d506931c6a4034f640aaa1e6ffd'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 26 Jul 2007 12:49:57 +0000 (12:49 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 26 Jul 2007 12:49:57 +0000 (12:49 +0000)
     and '6a838084d7927ab7f64149ec2659ec411cd2a923'


Trivial merge