Merge branch 'master' of https://vcs.maemo.org/git/livewp
authortanya <tanyshk@gmail.com>
Tue, 21 Sep 2010 04:57:51 +0000 (07:57 +0300)
committertanya <tanyshk@gmail.com>
Tue, 21 Sep 2010 04:57:51 +0000 (07:57 +0300)

Trivial merge