[parrot/parrot] 310ade: Merge branch 'tt1331-osx-conf-fix'

[noreply at github.com]

Branch: refs/heads/generational_gc
Home:   https://github.com/parrot/parrot

Commit: 310adea9c41b2c5e089ce1470d7d30bdd1390cb2
    https://github.com/parrot/parrot/commit/310adea9c41b2c5e089ce1470d7d30bdd1390cb2
Author: Jonathan "Duke" Leto <jonathan at leto.net>
Date:   2011-02-08 (Tue, 08 Feb 2011)

Changed paths:
  M config/gen/makefiles/root.in
  M config/init/hints/darwin.pm

Log Message:
-----------
Merge branch 'tt1331-osx-conf-fix'


Commit: 942932e671e01ac59d589cc8bb02adbacdf13304
    https://github.com/parrot/parrot/commit/942932e671e01ac59d589cc8bb02adbacdf13304
Author: Nick Wellnhofer <wellnhofer at aevum.de>
Date:   2011-02-08 (Tue, 08 Feb 2011)

Changed paths:
  M NEWS

Log Message:
-----------
Update NEWS


Commit: 1c711886baa9ed59f504a2d8aebd5acec20973dc
    https://github.com/parrot/parrot/commit/1c711886baa9ed59f504a2d8aebd5acec20973dc
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2011-02-08 (Tue, 08 Feb 2011)

Changed paths:
  M include/parrot/api.h
  M src/embed/api.c
  M t/src/embed/api.t

Log Message:
-----------
Merge branch 'whiteknight/callcontext_reset'


Commit: e7cb4a193d28970a9d1f088648225b8a78e5d910
    https://github.com/parrot/parrot/commit/e7cb4a193d28970a9d1f088648225b8a78e5d910
Author: Vasily Chekalkin <bacek at bacek.com>
Date:   2011-02-08 (Tue, 08 Feb 2011)

Changed paths:
  M MANIFEST
  M NEWS
  M compilers/data_json/data_json.pir
  M config/auto/pmc.pm
  M config/gen/makefiles/root.in
  M config/init/hints/darwin.pm
  M docs/project/release_manager_guide.pod
  M include/parrot/api.h
  M include/parrot/pobj.h
  R lib/Parrot/Pmc2c/ComposedMethod.pm
  M lib/Parrot/Pmc2c/Dumper.pm
  M lib/Parrot/Pmc2c/Library.pm
  M lib/Parrot/Pmc2c/Method.pm
  R lib/Parrot/Pmc2c/MethodEmitter.pm
  M lib/Parrot/Pmc2c/PCCMETHOD.pm
  M lib/Parrot/Pmc2c/PMC.pm
  R lib/Parrot/Pmc2c/PMC/ParrotClass.pm
  M lib/Parrot/Pmc2c/PMC/RO.pm
  R lib/Parrot/Pmc2c/PMCEmitter.pm
  M lib/Parrot/Pmc2c/Parser.pm
  M lib/Parrot/Pmc2c/UtilFunctions.pm
  M src/embed/api.c
  M src/pointer_array.c
  M t/pmc/resizablepmcarray.t
  M t/src/embed/api.t
  M tools/build/h2inc.pl

Log Message:
-----------
Merge branch 'master' into generational_gc

Conflicts:
	include/parrot/pobj.h
	lib/Parrot/Pmc2c/MethodEmitter.pm
	lib/Parrot/Pmc2c/PMCEmitter.pm
	src/pointer_array.c