Merge branch 'incoming' into f32

Conflicts:
	src/parseTools.js
	src/preamble.js

1 files changed, 2 insertions, 2 deletions

diff --git a/src/preamble.js b/src/preamble.js
index b1434deb..3238c99c 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -1060,7 +1060,7 @@ Module['writeAsciiToMemory'] = writeAsciiToMemory;
 {{{ reSign }}}
 
 #if PRECISE_I32_MUL
-if (!Math['imul']) Math['imul'] = function(a, b) {
+if (!Math['imul']) Math['imul'] = function imul(a, b) {
   var ah  = a >>> 16;
   var al = a & 0xffff;
   var bh  = b >>> 16;
@@ -1068,7 +1068,7 @@ if (!Math['imul']) Math['imul'] = function(a, b) {
   return (al*bl + ((ah*bl + al*bh) << 16))|0;
 };
 #else
-Math['imul'] = function(a, b) {
+Math['imul'] = function imul(a, b) {
   return (a*b)|0; // fast but imprecise
 };
 #endif