merge of '9c8c9d1da282e7fa893b34c07ed5b5c73e0b1013'
authorCliff Brake <cbrake@bec-systems.com>
Thu, 9 Aug 2007 19:12:19 +0000 (19:12 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Thu, 9 Aug 2007 19:12:19 +0000 (19:12 +0000)
     and 'a6f65a6f4f01acf2276466a1453ccd50184de22d'


Trivial merge