Merge branch 'master' of https://vcs.maemo.org/git/livewp
authorVlad Vasiliev <vlad@toshiba2.oblgaz>
Sun, 4 Apr 2010 17:44:09 +0000 (20:44 +0300)
committerVlad Vasiliev <vlad@toshiba2.oblgaz>
Sun, 4 Apr 2010 17:44:09 +0000 (20:44 +0300)
commitff9b2ebe9754a20856a7f03ae5f90fee5a1b3677
tree24789e2d0278423a18f54243fb35d20bca86a02e
parentfe4df943aebaf9222fbe5dac6f7a4eeb89db7ab3
parentbf9f6d5febd81aa78059de5a6f3c7fabd38f25bb
Merge branch 'master' of https://vcs.maemo.org/git/livewp

Conflicts:

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