Merge remote branch 'repo/master'
authorJean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Sat, 11 Jun 2011 12:51:53 +0000 (08:51 -0400)
committerJean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Sat, 11 Jun 2011 12:51:53 +0000 (08:51 -0400)

Trivial merge