Merge branch 'forgot'
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 14 Jan 2011 06:59:25 +0000 (08:59 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 14 Jan 2011 06:59:25 +0000 (08:59 +0200)
commita998deb8c0b98c194ae291b6a67e44da5a0372c4
treed40904a1495e4589bdab16bf306a3d1d8f2348a7
parent3270ec8c0f9cc234f279d40ebdace17c0641ceec
parent05c9d75bb2f0774a995f3a30577f58cf8c0013cb
Merge branch 'forgot'