ref: ab5a0497056a4095a1bfe40e4dbebb12d7c503f2
parent: 64e8021c2fc7bb8faf697750778a5e267663040b
parent: 390c89225d6eb3cbd974a9d3f9eb3f6b723fbeb3
author: Jean-Marc Valin <jmvalin@jmvalin.ca>
date: Tue Apr 24 09:39:22 EDT 2012
Merge commit '390c89225d'