Merge branch 'master' of https://vcs.maemo.org/git/livewp
authortanya <tanyshk@gmail.com>
Thu, 30 Sep 2010 06:32:02 +0000 (09:32 +0300)
committertanya <tanyshk@gmail.com>
Thu, 30 Sep 2010 06:32:02 +0000 (09:32 +0300)

Trivial merge