[parrot/parrot] dc4296: Merge branch 'master' into nwellnhof/platform_src

[noreply at github.com]

Branch: refs/heads/nwellnhof/platform_src
Home:   https://github.com/parrot/parrot

Commit: dc42962b4a06e12bfdba9d58dca7c0dfdc2fd9fd
    https://github.com/parrot/parrot/commit/dc42962b4a06e12bfdba9d58dca7c0dfdc2fd9fd
Author: Nick Wellnhofer <wellnhofer at aevum.de>
Date:   2011-01-10 (Mon, 10 Jan 2011)

Changed paths:
  M config/gen/makefiles/root.in

Log Message:
-----------
Merge branch 'master' into nwellnhof/platform_src