Merge "Updated for Gingerbread GApps and current mirror list, as well as add options for CM6 tegra, CM5 and CM4." into gingerbread