Merge branch 'master' of ssh://git.popipo.fr/~benoit/gps