Merge branch 'master' of https://vcs.maemo.org/git/livewp
authorVlad Vasiliev <vlad@toshiba2.oblgaz>
Sun, 11 Apr 2010 19:23:54 +0000 (22:23 +0300)
committerVlad Vasiliev <vlad@toshiba2.oblgaz>
Sun, 11 Apr 2010 19:23:54 +0000 (22:23 +0300)
commit5827a1e99a8f88ead7a5ee675a8668437f81bd32
tree85f560eef73ad8b82439dbcdb888f379c0d1869c
parent0e9d451d861613e42b327fbdffcf2e5701cd2172
parent0714e225bb50f130a33de2649e0c3a8c923dc04a
Merge branch 'master' of https://vcs.maemo.org/git/livewp

Conflicts:

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