Merge branch 'master' of https://vcs.maemo.org/git/livewp
authortanya <tanyshk@gmail.com>
Thu, 29 Jul 2010 13:47:31 +0000 (16:47 +0300)
committertanya <tanyshk@gmail.com>
Thu, 29 Jul 2010 13:47:31 +0000 (16:47 +0300)

Trivial merge