Merge branch 'master' of git+ssh://git.gnome.org/git/seed
authorTim Horton <hortont@hortont.com>
Mon, 23 Feb 2009 20:24:14 +0000 (15:24 -0500)
committerTim Horton <hortont424@gmail.com>
Mon, 23 Feb 2009 20:24:14 +0000 (15:24 -0500)

Trivial merge