Merge branch 'master' of https://git.maemo.org/projects/theonering
authorEd Page <eopage@byu.net>
Sat, 17 Oct 2009 21:38:30 +0000 (16:38 -0500)
committerEd Page <eopage@byu.net>
Sat, 17 Oct 2009 21:38:30 +0000 (16:38 -0500)

Trivial merge