[parrot/parrot] 50bd6b: Fix merge error.

[noreply at github.com]

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

Commit: 50bd6bef9238259303cf5832a04401bbed66be8e
    https://github.com/parrot/parrot/commit/50bd6bef9238259303cf5832a04401bbed66be8e
Author: Vasily Chekalkin <bacek at bacek.com>
Date:   2011-03-29 (Tue, 29 Mar 2011)

Changed paths:
  M runtime/parrot/library/LLVM/Builder.pm

Log Message:
-----------
Fix merge error.


Commit: 135304482c133b79ee69d6fa195bb9e4385e214f
    https://github.com/parrot/parrot/commit/135304482c133b79ee69d6fa195bb9e4385e214f
Author: Vasily Chekalkin <bacek at bacek.com>
Date:   2011-03-29 (Tue, 29 Mar 2011)

Changed paths:
  M compilers/opsc/src/Ops/JIT.pm

Log Message:
-----------
Rework handling of variables (including registers) to be more generic on LHS of assignements.


Compare: https://github.com/parrot/parrot/compare/c46a38e...1353044