Merge branch 'gnome-2-26'
authorStef Walter <stef@memberwebs.com>
Mon, 13 Jul 2009 17:18:45 +0000 (17:18 +0000)
committerStef Walter <stef@memberwebs.com>
Mon, 13 Jul 2009 17:18:45 +0000 (17:18 +0000)

Trivial merge