Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 14 Jan 2011 07:06:26 +0000 (09:06 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 14 Jan 2011 07:06:26 +0000 (09:06 +0200)
commit7155b3d637204d8f6ceb8d028c58c8bd16d43a59
tree2bd081985432660bc7bdfe5af62dfa8754c49120
parentaeb8497cec8797386d750966035da47ccb42e418
parent7a11646156706fc9122d991da4b1011b6801b583
Merge branch 'master' into harmattan