Merge branch 'develop' into io
authorPaul Brossier <piem@piem.org>
Fri, 13 Jul 2012 06:29:43 +0000 (00:29 -0600)
committerPaul Brossier <piem@piem.org>
Fri, 13 Jul 2012 06:29:43 +0000 (00:29 -0600)

Trivial merge