Merge commit 'refs/merge-requests/959' of git://gitorious.org/qt/qt into integration
authorLorn Potter <lorn.potter@nokia.com>
Tue, 11 Jan 2011 02:31:43 +0000 (12:31 +1000)
committerLorn Potter <lorn.potter@nokia.com>
Tue, 11 Jan 2011 02:31:43 +0000 (12:31 +1000)
commit61ac6d3279d8bcdc3480766715229b391b8f6575
tree5962b396e82d34802321f810be70b0a39decf244
parent49257f86bdb090d97c387183e8f600bbb8a7eef3
parent8eab49de0548363b18c6e2c7b4ff4a8b722992d6
Merge commit 'refs/merge-requests/959' of git://gitorious.org/qt/qt into integration
src/plugins/bearer/connman/qconnmanengine.cpp
src/plugins/bearer/connman/qconnmanengine.h
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/bearer/connman/qconnmanservice_linux_p.h