bug 308672, use langpack-$(AB_CD)@firefox.mozilla.org for MOZ_LANGPACK_EID, r=bsmedberg, sr=chase

browser/locales/Makefile.in

@@ -61,6 +61,7 @@ APP_VERSION := $(shell cat $(srcdir)/../config/version.txt)
 
 DEFINES += \
 	-DAB_CD=$(AB_CD) \
+	-DMOZ_LANGPACK_EID=langpack-$(AB_CD)@firefox.mozilla.org \
 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
 	-DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
 	-DPKG_BASENAME=$(PKG_BASENAME) \

browser/locales/en-US/defines.inc

@@ -1,6 +1,5 @@
 #filter emptyLines
 
-#define MOZ_LANGPACK_EID {f68df430-4534-4473-8ca4-d5de32268a8d}
 #define MOZ_LANGPACK_CREATOR mozilla.org
 
 # If non-English locales wish to credit multiple contributors, uncomment this