bug 931230 - vcs-sync combine mapfiles bug. r=hwine