Merge branch 'master' into accel

author tanya <tanyshk@gmail.com>

Fri, 23 Jul 2010 08:49:45 +0000 (11:49 +0300)

committer tanya <tanyshk@gmail.com>

Fri, 23 Jul 2010 08:49:45 +0000 (11:49 +0300)
author tanya <tanyshk@gmail.com>
Fri, 23 Jul 2010 08:49:45 +0000 (11:49 +0300)
committer tanya <tanyshk@gmail.com>
Fri, 23 Jul 2010 08:49:45 +0000 (11:49 +0300)
diff --cc applet/src/livewp-home-widget.c
Simple merge
diff --cc applet/src/livewp-scene.c
Simple merge
diff --cc applet/src/livewp-settings.c
Simple merge
author	tanya <tanyshk@gmail.com>
	Fri, 23 Jul 2010 08:49:45 +0000 (11:49 +0300)
committer	tanya <tanyshk@gmail.com>
	Fri, 23 Jul 2010 08:49:45 +0000 (11:49 +0300)
		1	2
applet/src/livewp-home-widget.c	patch \|	diff1 \|	diff2 \|	blob \| history
applet/src/livewp-scene.c	patch \|	diff1 \|	diff2 \|	blob \| history
applet/src/livewp-settings.c	patch \|	diff1 \|	diff2 \|	blob \| history