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