Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 4 Oct 2011 09:10:50 +0000 (12:10 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 4 Oct 2011 09:10:50 +0000 (12:10 +0300)
commitdb276f25443647d2dd1c216cb1920f2a852fca70
tree87be5e82ba474c359b06eefaac7cf729489fd899
parentf3e6d539d92b864cd92acd03c537aea465ffa81c
parent3fcaa8d226b15becaa1a420c0e75613b6892a307
Merge branch 'master' into harmattan