Merge branch 'io' into develop
authorPaul Brossier <piem@piem.org>
Fri, 27 Jul 2012 03:30:11 +0000 (21:30 -0600)
committerPaul Brossier <piem@piem.org>
Fri, 27 Jul 2012 03:30:11 +0000 (21:30 -0600)

Trivial merge