Merge branch 'master' of https://vcs.maemo.org/git/livewp
authortanya <tanyshk@gmail.com>
Fri, 3 Sep 2010 05:36:39 +0000 (08:36 +0300)
committertanya <tanyshk@gmail.com>
Fri, 3 Sep 2010 05:36:39 +0000 (08:36 +0300)

Trivial merge