Merge branch 'power_save'
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 22 Jun 2010 12:10:30 +0000 (15:10 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 22 Jun 2010 12:10:30 +0000 (15:10 +0300)
commit2acc43cadfa13f87eb0f3aec3532922f1b4d646c
tree658add3adbc1758ebe2387324428803d0fc44207
parenta3b68065bdea08772c137d216730764b66cce658
parent828ceada96b5dc4fa5520fea0264c43e63fe8e30
Merge branch 'power_save'

Conflicts:
src/engine/engine.cpp
src/engine/engine.cpp
src/engine/engine.h
src/gps/gpsposition.h
src/gps/gpspositionprivate.cpp
src/gps/gpspositionprivateliblocation.cpp
src/gps/gpspositionprivatestub.cpp