Merge commit 'origin/riku-devel' into juha-devel
authorJuha Riihimäki <juhriihi@esdhcp035158.research.nokia.com>
Wed, 18 Mar 2009 06:48:02 +0000 (08:48 +0200)
committerJuha Riihimäki <juhriihi@esdhcp035158.research.nokia.com>
Wed, 18 Mar 2009 06:48:02 +0000 (08:48 +0200)

Trivial merge