Merge branch 'master' of https://git.maemo.org/projects/erwise master
authorToni Nikkanen <toni@tuug.fi>
Wed, 11 Mar 2009 16:21:53 +0000 (18:21 +0200)
committerToni Nikkanen <toni@tuug.fi>
Wed, 11 Mar 2009 16:21:53 +0000 (18:21 +0200)

Trivial merge