[parrot/parrot] d8eee3: Properly fix merge conflict. Previous workaround i...

[noreply at github.com]

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

Commit: d8eee3e152d792d309c2625faaa574e53bdfc143
    https://github.com/parrot/parrot/commit/d8eee3e152d792d309c2625faaa574e53bdfc143
Author: Vasily Chekalkin <bacek at bacek.com>
Date:   2010-12-02 (Thu, 02 Dec 2010)

Changed paths:
  M src/io/buffer.c

Log Message:
-----------
Properly fix merge conflict. Previous workaround isn't applicable anymore.