Merge branch 'bug_232168'
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 27 May 2011 11:54:03 +0000 (14:54 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 27 May 2011 11:54:03 +0000 (14:54 +0300)
commit916c968b9b34945881aea5397c719a91fe1712fa
treecee65ad440fc96e944c5ebcecfb684c85e5f916e
parent52db20552baa12e75261202db6cc6fe6bd81975e
parent5066396d86803dc0c482f9554bb2674446509ab3
Merge branch 'bug_232168'