Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 8 Nov 2010 11:56:07 +0000 (13:56 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 8 Nov 2010 11:56:07 +0000 (13:56 +0200)
commitadd2f62f3b5f9216da9dc320db0132ef19700cb0
tree33af3d638eca33675baa22aa728789b2c6db8d1c
parent4dc17d70a0e1d3e77299e5bc9dd2c31c08b989a2
parentc32e2ffa2e5efeade1b0dfcad6cf22804e853640
Merge branch 'master' into harmattan