Merge branch 'master' into wallika
[situare] / res /
2010-03-26 Pekka NissinenInitial version