Merge branch 'master' of https://vcs.maemo.org/git/livewp
authortanya <tanya@tanin.oblgaz>
Wed, 14 Apr 2010 06:30:40 +0000 (09:30 +0300)
committertanya <tanya@tanin.oblgaz>
Wed, 14 Apr 2010 06:30:40 +0000 (09:30 +0300)

Trivial merge