merge branches/ctapmex-far2colorer:1378-1382
Authored by: ctapmex 2010-02-14
Parent: [r1383]
Child: [r1385]