updating trunk and RC