svn path=/trunk/; revision=40523
This looses the last checkin to gtk, will add this manually back. svn path=/trunk/; revision=40518