Merge branch 'master' into new-state
authorKeith Packard <keithp@keithp.com>
Sat, 31 Aug 2013 13:22:09 +0000 (08:22 -0500)
committerKeith Packard <keithp@keithp.com>
Sat, 31 Aug 2013 13:22:09 +0000 (08:22 -0500)

Trivial merge