Merge branch 'master' of https://vcs.maemo.org/git/livewp
authorVlad <vlad@gas.by>
Fri, 23 Jul 2010 08:08:36 +0000 (11:08 +0300)
committerVlad <vlad@gas.by>
Fri, 23 Jul 2010 08:08:36 +0000 (11:08 +0300)
commit12bd5630c594e88e8eb4c6362a0cbfbebbaaa869
tree8d63fa595a956f390d39c00611b98adb96b145f7
parent3bc2ae5b9b5b4eff348fdba3a930312866c4b89e
parent970afa2688157ff3cd26cd0db917b169d9e5e7c0
Merge branch 'master' of https://vcs.maemo.org/git/livewp

Conflicts:
applet/debian/changelog
applet/src/livewp-home-widget.c
applet/configure.ac
applet/debian/changelog
applet/src/Makefile.am
applet/src/livewp-home-widget.c