Merge branch 'master' of https://vcs.maemo.org/git/livewp
authorVlad <vlad@gas.by>
Mon, 5 Jul 2010 08:58:38 +0000 (11:58 +0300)
committerVlad <vlad@gas.by>
Mon, 5 Jul 2010 08:58:38 +0000 (11:58 +0300)
Conflicts:
applet/po/ru_RU.po

1  2 
applet/po/ru_RU.po

Simple merge