Merge branch 'master' into accel
authortanya <tanyshk@gmail.com>
Fri, 23 Jul 2010 08:49:45 +0000 (11:49 +0300)
committertanya <tanyshk@gmail.com>
Fri, 23 Jul 2010 08:49:45 +0000 (11:49 +0300)
commit6b69a5332b3790f79431b3edd42c7c4a4ac7f2e5
tree0b92236b9a104b54ed0b995baa55d96170bf0c57
parentf63b44e317b9f6a3d514f904b7d75b257c2416eb
parent19cd71bc409f93030eba7b86de898626826980ac
Merge branch 'master' into accel
applet/src/livewp-home-widget.c
applet/src/livewp-scene.c
applet/src/livewp-settings.c