SVN-Revision: 31803
Compile tested only. SVN-Revision: 31765
Signed-of-By: Lauri Võsandi <lauri.vosandi@gmail.com> SVN-Revision: 26919