Merge branch 'master' of https://git.maemo.org/projects/xkcdha
authorEd Bartosh <bartosh@gmail.com>
Sat, 10 Jan 2009 00:45:31 +0000 (00:45 +0000)
committerEd Bartosh <bartosh@gmail.com>
Sat, 10 Jan 2009 00:45:31 +0000 (00:45 +0000)

Trivial merge