Merge branch 'develop' into io
authorPaul Brossier <piem@piem.org>
Mon, 16 Jul 2012 19:43:25 +0000 (13:43 -0600)
committerPaul Brossier <piem@piem.org>
Mon, 16 Jul 2012 19:43:25 +0000 (13:43 -0600)

Trivial merge