Merge branch 'master' of https://vcs.maemo.org/git/livewp
authorVlad <vlad@gas.by>
Wed, 28 Jul 2010 05:29:31 +0000 (08:29 +0300)
committerVlad <vlad@gas.by>
Wed, 28 Jul 2010 05:29:31 +0000 (08:29 +0300)
Conflicts:
applet/data/Makefile.in


Trivial merge