Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Mon, 22 Nov 2010 07:48:36 +0000 (09:48 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Mon, 22 Nov 2010 07:48:36 +0000 (09:48 +0200)
commit4a1cc0dc5bc0d0c73f6799c2faf7146914514a96
tree661c06d0f7c6670acc73b3d771df01fff9e275fd
parentbbde02c590bf3a51262bdee8c64b65c62e33a758
parentec702a5c1d278afccea40088f11ed2e8321da364
Merge branch 'master' into harmattan