Fighting poverty through sustainable water use: proceedings of the CGIAR Challenge Program on Water and Food, 2nd International Forum on Water and Food, Addis Ababa, Ethiopia, 10-14 November 2008. Vol.2. Increasing rainwater productivity; Multi-purpose water systems