Implement Mario's suggestions:
- Clean up code replace merge algorithm with a function.
- Fix for_statement setting control variable to not a constant.
- Fix for_statement checking BY expression to get correct value for optimization
branch.

Thanks Mario.

matiec (2009.0-%DATEVERSION%) unstable; urgency=low

  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>

 -- edouard <edouard.tisserant@gmail.com>  Wed, 21 Nov 2007 17:01:50 +0100