[parrot/parrot] ad9c8a: fix some unresolved conflicts from deprecations as...

[noreply at github.com]

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

Commit: ad9c8a039ea022006cf2f3b7d420fb46b4a5e528
    https://github.com/parrot/parrot/commit/ad9c8a039ea022006cf2f3b7d420fb46b4a5e528
Author: Christoph Otto <christoph_github at mksig.org>
Date:   2011-02-11 (Fri, 11 Feb 2011)

Changed paths:
  M docs/project/support_policy.pod

Log Message:
-----------
fix some unresolved conflicts from deprecations as data