2011-05-04 Simon Fraser <simon.fraser@apple.com>