Merge branch 'master' of git@scm.dev.nokia.troll.no:personal/lpotter-nokias-qconnman
authorLorn Potter <lorn.potter@nokia.com>
Tue, 27 Apr 2010 21:54:04 +0000 (07:54 +1000)
committerLorn Potter <lorn.potter@nokia.com>
Tue, 27 Apr 2010 21:54:04 +0000 (07:54 +1000)
commit4cfb82eafa359de1f8117599dc87c4ef02a5000c
tree5a27db6d98296b933d61cdeaa244317a529fe7a9
parentc0dde30bca7f4a8a2ed1416cd910c1e85a933bdc
parent807f8311b80fd7d03c8b4f3a8ae1fe96be0cedf5
Merge branch 'master' of git@scm.dev.nokia.troll.no:personal/lpotter-nokias-qconnman

Conflicts:
qconnmanservice_linux.cpp