reverse merge from 1.6.0 (r10156)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10710 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-17 00:40:20 +00:00
parent 4f9581fde5
commit 09dc853b4d

Diff content is not available