Merge branch 'master' of https://vcs.maemo.org/git/livewp

author Vlad <vlad@gas.by>

Mon, 6 Sep 2010 07:54:52 +0000 (10:54 +0300)

committer Vlad <vlad@gas.by>

Mon, 6 Sep 2010 07:54:52 +0000 (10:54 +0300)
author Vlad <vlad@gas.by>
Mon, 6 Sep 2010 07:54:52 +0000 (10:54 +0300)
committer Vlad <vlad@gas.by>
Mon, 6 Sep 2010 07:54:52 +0000 (10:54 +0300)
diff --cc applet/src/livewp-settings.c
Simple merge