Merge branch 'master' into error_procedur
authorlampehe-local <henri.lampela@ixonos.com>
Thu, 10 Jun 2010 12:07:40 +0000 (15:07 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Thu, 10 Jun 2010 12:07:40 +0000 (15:07 +0300)
commitda456410c889e0a7120369e80e5ba4d73776ca39
tree49abe8431a21f36cbe4e264112e680782a447485
parent1d67b887b817d4a3388bee0011201356a979efdc
parentf9079ec2f557165f038844ed4df04d5096d6fbee
Merge branch 'master' into error_procedur

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