Merge branch 'master' of https://vcs.maemo.org/git/situare
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Wed, 26 May 2010 12:36:11 +0000 (15:36 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Wed, 26 May 2010 12:36:11 +0000 (15:36 +0300)
commitf6e615fa507658e5eee036c0c5723e5ac4f2ed7f
tree6b69f18b4ff4d88af3bcad67836722b781c7a450
parent3c94453fa717b89a9154d74bf599c11ce4100ea6
parent396d8542e345f69e73519dde304a574a3a0be7ac
Merge branch 'master' of https://vcs.maemo.org/git/situare

Conflicts:
doc/test_cases/functionality-tests.doc
doc/test_cases/functionality-tests.doc
src/engine/engine.cpp