Merge branch 'master' of https://vcs.maemo.org/git/livewp
authortanya <tanya@tanin.oblgaz>
Fri, 9 Apr 2010 12:29:03 +0000 (15:29 +0300)
committertanya <tanya@tanin.oblgaz>
Fri, 9 Apr 2010 12:29:03 +0000 (15:29 +0300)
commit07130e8773d06776d59601d6ec6ddaca52681bbd
tree9a7629ee1fd7d90cec53f6a10178c77080d3f651
parentdc5b3a9f5421e2b0f811c17cfb40d06c7674f305
parent2b7268ea805bf8f3d1cb3e645fddd4f2b276b910
Merge branch 'master' of https://vcs.maemo.org/git/livewp

Conflicts:

applet/src/livewp-home-widget.c
applet/src/livewp-home-widget.c