Define vasprintf in native for Blackberry instead (as it is also used there). Remove some redundancy in Settings.pri.
Return an error when loading a module twice.

The PSP does this, and FF4 checked for this error specifically.
Fixed JP localization
Merge pull request #1454 from unknownbrackets/utility-loaded

Return an error when loading a module twice.
Adding es_LA to langMapping

Switching to es_LA -> default language spanish instead of english
Merge pull request #1456 from ufdada/patch-1

Adding es_LA to langMapping
Rename ja_JA.ini -> ja_JP.ini
fine-tuning traditional chinese (zh_tw) translations
Update zh_TW.ini

small fix
Merge pull request #1464 from medicalwei/master

Update zh_TW to "Taiwanese-flavored Traditional Chinese"
Merge pull request #1455 from nachume/localization

Fixed JP localization
Update nl_NL.ini
Merge pull request #1467 from GuardianSoul/patch-3

Update nl_NL.ini
Update fonts again
Update Android version to 0.7.6
Change back default button preference to cross. Oops, accidentally released 0.7.6 with circle.. oh well.
Merge remote-tracking branch 'upstream/master' into fps2

Conflicts:
	native
	pspautotests
Merge branch 'fps2' of https://github.com/leejuiping/ppsspp into fps2