Merge branch 'gnome-2-26'
authorStef Walter <stef@memberwebs.com>
Fri, 26 Jun 2009 17:33:03 +0000 (17:33 +0000)
committerStef Walter <stef@memberwebs.com>
Fri, 26 Jun 2009 17:33:03 +0000 (17:33 +0000)

Trivial merge