Merge branch 'gdk-pixbuf'
authorOlof-Joachim Frahm <Olof.Frahm@web.de>
Thu, 4 Nov 2010 03:34:43 +0000 (04:34 +0100)
committerOlof-Joachim Frahm <Olof.Frahm@web.de>
Thu, 4 Nov 2010 03:34:43 +0000 (04:34 +0100)

Trivial merge