Merge branch 'master' of scm.dev.nokia.troll.no:personal/lpotter-nokias-qconnman
authorLorn Potter <lorn.potter@nokia.com>
Mon, 3 May 2010 23:59:44 +0000 (09:59 +1000)
committerLorn Potter <lorn.potter@nokia.com>
Mon, 3 May 2010 23:59:44 +0000 (09:59 +1000)
commita26e6e6c86e1698c35c9d7f59ddb8866f3155d06
tree7c60bf4f338402f1a8eda3b9fb4fec9f64540077
parent4cfb82eafa359de1f8117599dc87c4ef02a5000c
parent971c01004b54ae294495c661f835c5309e010a86
Merge branch 'master' of scm.dev.nokia.troll.no:personal/lpotter-nokias-qconnman