Merge branch 'develop' into io
authorPaul Brossier <piem@piem.org>
Sun, 15 Jul 2012 22:44:48 +0000 (16:44 -0600)
committerPaul Brossier <piem@piem.org>
Sun, 15 Jul 2012 22:44:48 +0000 (16:44 -0600)

Trivial merge