Merge branch 'master' of https://git.maemo.org/projects/belltower
authorThomas Thurman <tthurman@gnome.org>
Mon, 31 Aug 2009 14:37:47 +0000 (10:37 -0400)
committerThomas Thurman <tthurman@gnome.org>
Mon, 31 Aug 2009 14:37:47 +0000 (10:37 -0400)

Trivial merge