Merge branch 'develop' into io
authorPaul Brossier <piem@piem.org>
Fri, 27 Jul 2012 16:39:20 +0000 (10:39 -0600)
committerPaul Brossier <piem@piem.org>
Fri, 27 Jul 2012 16:39:20 +0000 (10:39 -0600)

Trivial merge