Addendum to 2009-10-18 commit.
7 files changed