Merge branch 'master' of https://vcs.maemo.org/git/vexed
authorpaul romanchenko <paulaner@gmail.com>
Thu, 16 Sep 2010 13:04:35 +0000 (17:04 +0400)
committerpaul romanchenko <paulaner@gmail.com>
Thu, 16 Sep 2010 13:04:35 +0000 (17:04 +0400)

Trivial merge