Commit a7ffd936bf26f6c7bb0a1d1dee811ace2c1c848e

Vicent Marti 2013-01-04T17:46:38

clar: fix merge/setup.c