2010-09-09 Simon Fraser <simon.fraser@apple.com>