PR: 4275 Submitted by: Chris Stenton <jacs@gnome.co.uk>
PR: 3377 Submitted by: Chris Stenton <jacs@gnome.co.uk>