Merge branch 'integration' of https://vcs.maemo.org/git/situare into integration
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 12:27:11 +0000 (15:27 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 12:27:11 +0000 (15:27 +0300)
commit0e5aaf266b646a30f8c782c8a132bd74e4e2cae5
treea8fbcea15fbf6c24ee1dd4316e0b7840a3a98b13
parentdfcea95054582e3ef83b366e0b0f5671b8b43282
parentc47f427ad9bec3fbb5908105409a71c6172a0963
Merge branch 'integration' of https://vcs.maemo.org/git/situare into integration

Conflicts:
src/engine/engine.h
src/engine/engine.cpp
src/engine/engine.h