Merge branch 'master' into userinfo
[situare] / res / images / sight.png
2010-05-17 lampehe-localMerged to master