revert my 1.x.99 stuff so i can branch.
revert my 1.x.99 stuff so i can branch.



git-svn-id: a6113611d365f0fc061992be0d1d0b451b434026@65803 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

jordemort/eina,jordemort/eina,jordemort/eina