merge of 'cf0ca1fb863b51f73e0fc8ddecad3dfd621225e9'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Jun 2007 17:34:04 +0000 (17:34 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Jun 2007 17:34:04 +0000 (17:34 +0000)
     and 'ecd8452f93b34254190e688ff33a2d839e85e090'


Trivial merge