Merge branch 'master' of ssh://drop.maemo.org/git/livewp
authorvlad <vlad@vlanout.(none)>
Sun, 19 Sep 2010 17:55:38 +0000 (20:55 +0300)
committervlad <vlad@vlanout.(none)>
Sun, 19 Sep 2010 17:55:38 +0000 (20:55 +0300)

Trivial merge