Merge branch 'bug_188172'
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Oct 2010 08:19:50 +0000 (11:19 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Oct 2010 08:19:50 +0000 (11:19 +0300)

Trivial merge