Merge branch 'ramosam' into juksa_local
[situare] / release /
2010-03-26 Pekka NissinenInitial version