ref: 7143b2d0ff61690b698cc8a8b0e61852ba74d984
parent: dac1b4fc92b0581874af28f84f013b8618ec315c
parent: 88f22f2d17e882c55729a9bef46a3cf07b3f29d6
author: Jean-Marc Valin <jmvalin@jmvalin.ca>
date: Tue May 15 20:36:19 EDT 2012
Merge branch 'tmp_draft' Conflicts: README