Merge commit 'origin/master' into juha-devel
authorJuha Riihimäki <juhriihi@esdhcp03982.research.nokia.com>
Thu, 5 Mar 2009 11:21:03 +0000 (13:21 +0200)
committerJuha Riihimäki <juhriihi@esdhcp03982.research.nokia.com>
Thu, 5 Mar 2009 11:21:03 +0000 (13:21 +0200)

Trivial merge