Merge branch 'master' into harmattan
authorJari Vanhala <jari.vanhala@ixonos.com>
Wed, 28 Sep 2011 11:10:38 +0000 (14:10 +0300)
committerJari Vanhala <jari.vanhala@ixonos.com>
Wed, 28 Sep 2011 11:10:38 +0000 (14:10 +0300)
commit0b268ad86a3dce4cc6119580316791309e1d4671
treee2b27680d9848c2a6423d0e5487a84232dbf998f
parentc75039b5fb70bb0e15a3be1a113a85323b2a4570
parent19df4685acf73450883f84427d1d84fa195bea50
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri