Merge branch 'profiling-callbacks'

diff --cc AUTHORS
index c4bb8d38c6bddf582f6f8fa3623d8fc0f7c75cea,4b070aaf30ceef14045972d58c383974692e9c20..19bc1c923c7d4c45b21268be89ed30356a69ff3e
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -217,9 -214,9 +217,10 @@@ Laurent Morichetti <l_m@pacbell.net
  Linas Vepstas <linasvepstas@gmail.com>
  Loren J. Rittle <rittle@latour.labs.mot.com>
  Louis Zhuang <louis.zhuang@acm.org>
+ Lucas Meijer <lucas@unity3d.com>
  Ludovic Courtes <ludo@gnu.org>
  Maarten Thibaut <mthibaut@cisco.com>
 +Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>
  Manuel Serrano <serrano@cornas.inria.fr>
  Marc Recht <recht@netbsd.org>
  Marco Maggi <marco.maggi-ipsu@poste.it>

diff --cc alloc.c
Simple merge

diff --cc darwin_stop_world.c
Simple merge

diff --cc include/gc.h
Simple merge

diff --cc include/private/gc_priv.h
Simple merge

diff --cc misc.c
Simple merge

diff --cc win32_threads.c
Simple merge