Merge with SVN trunk

.hgignore

indra/lib/python/indra/util/llversion.py

indra/newview/character/avatar_eye.llm

indra/newview/character/avatar_eye_1.llm

indra/newview/character/avatar_eyelashes.llm

indra/newview/character/avatar_hair.llm

indra/newview/character/avatar_hair_1.llm

indra/newview/character/avatar_hair_2.llm

indra/newview/character/avatar_hair_3.llm

indra/newview/character/avatar_hair_4.llm

indra/newview/character/avatar_hair_5.llm

indra/newview/character/avatar_head.llm

indra/newview/character/avatar_head_1.llm

indra/newview/character/avatar_head_2.llm

indra/newview/character/avatar_head_3.llm

indra/newview/character/avatar_head_4.llm

indra/newview/character/avatar_lower_body.llm

indra/newview/character/avatar_lower_body_1.llm

indra/newview/character/avatar_lower_body_2.llm

indra/newview/character/avatar_lower_body_3.llm