2010-05-22 Maciej Stachowiak <mjs@apple.com>