Merge branch 'master' of https://vcs.maemo.org/git/livewp
authorEmanuele Cassioli <maemo@maemo-desktop.(none)>
Sat, 4 Sep 2010 17:40:43 +0000 (18:40 +0100)
committerEmanuele Cassioli <maemo@maemo-desktop.(none)>
Sat, 4 Sep 2010 17:40:43 +0000 (18:40 +0100)

Trivial merge