Merge remote-tracking branch 'origin/pr/371'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 19 Jul 2013 18:48:40 +0000 (20:48 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 19 Jul 2013 18:48:40 +0000 (20:48 +0200)

Trivial merge