merged the w45 and trunk changelog.