Check-in code from gnome tutorial project.
Merge remote-tracking branch 'origin/master'