Automated merge with ssh://hg@bitbucket.org/basho/erlang_js/
Automated merge with ssh://hg@bitbucket.org/basho/erlang_js/

zero778/erlang_js,sameroom/erlang_js,systra/erlang_js,zero778/erlang_js,sameroom/erlang_js,systra/erlang_js,kevsmith/erlang_js-jaegermonkey,cristianberneanu/erlang_js,kevsmith/erlang_js-jaegermonkey,zero778/erlang_js,kevsmith/erlang_js-jaegermonkey,basho/erlang_js,cristianberneanu/erlang_js,basho/erlang_js,sameroom/erlang_js,basho/erlang_js