fix faulty merge of Manos.csprog
fix faulty merge of Manos.csprog

mdavid/manos-spdy,jacksonh/manos,jacksonh/manos,mdavid/manos-spdy,jmptrader/manos,jacksonh/manos,jmptrader/manos,jmptrader/manos,jacksonh/manos,jacksonh/manos,jacksonh/manos,jmptrader/manos,jmptrader/manos,mdavid/manos-spdy,jacksonh/manos,mdavid/manos-spdy,jmptrader/manos,jmptrader/manos,jacksonh/manos,mdavid/manos-spdy,mdavid/manos-spdy,jmptrader/manos,mdavid/manos-spdy