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

Trivial merge