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

Trivial merge