2011 updated master

for xili-language v 2.10+