Merge branch 'master' of https://vcs.maemo.org/git/ptas
authorMax Waterman <davidmaxwaterman+maemogit@fastmail.co.uk>
Sun, 7 Feb 2010 16:54:24 +0000 (18:54 +0200)
committerMax Waterman <davidmaxwaterman+maemogit@fastmail.co.uk>
Sun, 7 Feb 2010 16:54:24 +0000 (18:54 +0200)

Trivial merge