update for trunk changes between 2008-02-07 and today