Merge in WordPress trunk themes directory.