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

author Vlad <vlad@gas.by>

Thu, 12 Aug 2010 12:54:15 +0000 (15:54 +0300)

committer Vlad <vlad@gas.by>

Thu, 12 Aug 2010 12:54:15 +0000 (15:54 +0300)
author Vlad <vlad@gas.by>
Thu, 12 Aug 2010 12:54:15 +0000 (15:54 +0300)
committer Vlad <vlad@gas.by>
Thu, 12 Aug 2010 12:54:15 +0000 (15:54 +0300)
diff --cc applet/src/livewp-exthemes.c
Simple merge
diff --cc applet/src/livewp-settings.c
Simple merge
		1	2
applet/src/livewp-exthemes.c	patch \|	diff1 \|	diff2 \|	blob \| history
applet/src/livewp-settings.c	patch \|	diff1 \|	diff2 \|	blob \| history