Correct my email address.
Resolve symbolic links when checking for destination locations in file_packager. Fixes browser.test_preload_file on OSX.
Support syntax --preload-file x@x where both sides are identical and outside the current source tree. The code would accidentally treat that case as if user had instead written '--preload-file x'. Closes #2201.
more work on hackish function removal using profiling
Merge branch 'incoming' of https://github.com/kripken/emscripten into incoming
Merge pull request #2206 from juj/fix_osx_test_preload_file

Resolve symbolic links when checking for destination locations in file_packager. Fixes browser.test_preload_file on OSX.
Merge pull request #2202 from abergmeier/fix_address

Correct my email address.
Merge branch 'incoming' of https://github.com/kripken/emscripten into incoming
Implement emscripten_async_wget2_data

This adds the new function emscripten_async_wget2_data to read from
an XMLHTTPRequest directly into memory while supporting advanced features.
Merge branch 'incoming' of https://github.com/kripken/emscripten into incoming

Conflicts:
	system/include/emscripten/emscripten.h