Handle providers a little better.
Handle providers a little better.

SVN revision: 51938

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