Merge branch 'master' of ssh://git.popipo.fr/~benoit/gps
authorBenoit Papillault <benoit.papillault@free.fr>
Sat, 17 Dec 2011 18:37:56 +0000 (19:37 +0100)
committerBenoit Papillault <benoit.papillault@free.fr>
Sat, 17 Dec 2011 18:37:56 +0000 (19:37 +0100)

Trivial merge