Merge branch 'upstream'
[routino] / doc / html / readme.html
2010-12-15 Thibaut GRIDELImported Upstream version 1.5.1 upstream