Merge branch 'master' of ssh://drop.maemo.org/git/livewp
authorvlad <vlad@vlanout.(none)>
Thu, 2 Sep 2010 20:41:16 +0000 (23:41 +0300)
committervlad <vlad@vlanout.(none)>
Thu, 2 Sep 2010 20:41:16 +0000 (23:41 +0300)

Trivial merge