Merge branch 'master' of https://vcs.maemo.org/git/livewp into api
authortanya <tanyshk@gmail.com>
Fri, 6 Aug 2010 12:57:56 +0000 (15:57 +0300)
committertanya <tanyshk@gmail.com>
Fri, 6 Aug 2010 12:57:56 +0000 (15:57 +0300)

Trivial merge