Merge branch 'master' of git://gitorious.org/mobilegtd/mobilegtd