Sync our trunk to apache.