version up : zc.buildout-1.7.1-dev-SlapOS-005.
cairo: specify m4 location.
Merge remote-tracking branch 'origin/master' into erp5-cluster