Daniel Veillard <veillard@redhat.com>

and parts borrowed from marmot are from:
James Willcox  <jwillcox@gnome.org>
Corey Bowers  <cobowers@indiana.edu>
