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