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

Trivial merge