2011-06-08  syzler  <syzler>

[bde5eaff4054] [1.1.3]
* Final merge of localization branch.


