Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 25 Jan 2011 11:40:41 +0000 (13:40 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 25 Jan 2011 11:40:41 +0000 (13:40 +0200)
commitc0cc92c1c89c150756ef9fd1244f9bae1ac9178c
tree21f0d2fcbd4df43e99780c76a56623ff05e0e208
parenta2fe18809ee643ccbf1fabda213dfb14f706d65b
parent47bc5c343daa65dea6a5b4fd76c6d04c789d390f
Merge branch 'master' into harmattan