Merge branch 'master' of https://vcs.maemo.org/git/livewp
authorVlad <vlad@gas.by>
Wed, 28 Jul 2010 05:29:31 +0000 (08:29 +0300)
committerVlad <vlad@gas.by>
Wed, 28 Jul 2010 05:29:31 +0000 (08:29 +0300)
commit8c749fd0286ae49c51c41fe86c6f1f7276246efa
tree3246e9ae7e4b64e7a555da158160fa5d9ddb3ed5
parent4238fb15f8c15d15b3afb52fe942269d2ad4f1a5
parentd6e0a0f494e88e48b0f1747e96e64479737cf5c5
Merge branch 'master' of https://vcs.maemo.org/git/livewp

Conflicts:
applet/data/Makefile.in