Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 10 Jun 2010 09:31:55 +0000 (12:31 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 10 Jun 2010 09:31:55 +0000 (12:31 +0300)
commitd606170bdbdab382a126aa9a9dd26c7ac1df4833
treee60ea74d327e3be5e06b94ff5a14493c31d2d38b
parentb34801d5f9b3869e3fb8b726f02cc0cb546364d0
parent9e3ec7a261534c11517323f25f2e8c64321d1f6e
Merge branch 'master' of https://vcs.maemo.org/git/situare

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