Merge develop into device
authorPaul Brossier <piem@piem.org>
Sat, 23 Mar 2013 06:06:59 +0000 (01:06 -0500)
committerPaul Brossier <piem@piem.org>
Sat, 23 Mar 2013 06:06:59 +0000 (01:06 -0500)

Trivial merge