Merge branch 'alak_proxySet' into MyHarmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Tue, 15 Nov 2011 08:10:19 +0000 (10:10 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Tue, 15 Nov 2011 08:10:19 +0000 (10:10 +0200)
commit4215f8a1f07b4e53b5d198104c432062f4676094
treec7fa09b6501d85ca3328020a77eec79987b72c07
parent829586f9ad481683c968fa46e56a5aa16b71a553
parent7f5c5327c2abf0882b5fd9b2cf0e8a6cf6ef5d17
Merge branch 'alak_proxySet' into MyHarmattan