Merge branch 'forgot'
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 14 Jan 2011 09:38:05 +0000 (11:38 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 14 Jan 2011 09:38:05 +0000 (11:38 +0200)
commit68d57e33ac9b5750d5a4c62bc27e9659be254404
tree9a0986fc8bc8d8d59094332994f64d2afa9df041
parent2c7398046bb3e555d6531dbd3e0d2860a40484fc
parent19f26ca738d28665e96b1964e8774ef64b2b80c7
Merge branch 'forgot'