Changes for 2010-01-15 by me (ejelome).