Merge branch 'master' of https://vcs.maemo.org/git/gigfinder master
authorJon <jmstaley>
Tue, 3 Aug 2010 21:32:24 +0000 (22:32 +0100)
committerJon <jmstaley>
Tue, 3 Aug 2010 21:32:24 +0000 (22:32 +0100)

Trivial merge