bump sha1

merge in changes from TkExtras branch