Merge branch 'master' of https://vcs.maemo.org/git/livewp
authortanya <tanya@tanin.oblgaz>
Fri, 9 Apr 2010 19:11:42 +0000 (22:11 +0300)
committertanya <tanya@tanin.oblgaz>
Fri, 9 Apr 2010 19:11:42 +0000 (22:11 +0300)

Trivial merge