Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 14 Dec 2010 10:42:19 +0000 (12:42 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 14 Dec 2010 10:42:19 +0000 (12:42 +0200)
commitf0e45c6fdeefb43e6682312191220cb413df42fb
tree65758473fa769ac88bc27ddf31538a376966516d
parent0eaefae651603c48a28037963c73ceda33680608
parent76879fda0fc548e0b829bd7bb099f517e982bdf8
Merge branch 'master' into harmattan