[ros-diffs] [fireball] 25487: - Sync desk.cpl with trunk