Merge branch 'master' of https://vcs.maemo.org/git/livewp
authortanya <tanyshk@gmail.com>
Fri, 17 Sep 2010 12:37:11 +0000 (15:37 +0300)
committertanya <tanyshk@gmail.com>
Fri, 17 Sep 2010 12:37:11 +0000 (15:37 +0300)

Trivial merge