Merge remote-tracking branch 'mjb/master'
authorKeith Packard <keithp@keithp.com>
Tue, 7 Aug 2012 18:48:20 +0000 (11:48 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 7 Aug 2012 18:48:20 +0000 (11:48 -0700)

Trivial merge