elementary: reduce risk of race condition.
elementary: reduce risk of race condition.


SVN revision: 60128

rvandegrift/elementary,FlorentRevest/Elementary,tasn/elementary,FlorentRevest/Elementary,tasn/elementary,tasn/elementary,rvandegrift/elementary,tasn/elementary,tasn/elementary,FlorentRevest/Elementary,FlorentRevest/Elementary,rvandegrift/elementary,rvandegrift/elementary