Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 21 Mar 2011 19:04:39 +0000 (21:04 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 21 Mar 2011 19:04:39 +0000 (21:04 +0200)
commit6b694c08ca4af896970a602f27ed59e4746acff7
treef38729e2ba820245eee1bafe68b01a668459df34
parent1c35fbd311068071d7d4848a0b3adcab173f4f2f
parent9a9b1514fffcb6cf0770358e67bf7c27987ea2b4
Merge branch 'master' into harmattan