elementary: more compliant to the api
elementary: more compliant to the api

SVN revision: 64699

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