Commit ac6764da0c0ad499e51a36db0a818b03b697ef37

Stefano Lattarini 2011-04-11T17:06:05

Merge branch 'fix-depcomp' into maint