2008-06-05 Maciej Stachowiak <mjs@apple.com>