Merge branch 'develop' into io
authorPaul Brossier <piem@piem.org>
Tue, 17 Jul 2012 00:53:51 +0000 (18:53 -0600)
committerPaul Brossier <piem@piem.org>
Tue, 17 Jul 2012 00:53:51 +0000 (18:53 -0600)

Trivial merge