2011-05-16 Maciej Stachowiak <mjs@apple.com>