* Fix a missing trailing slash in the PLIST generation script. * Fix a broken conflict marker. OK kili@, thanks.