Merge remote-tracking branch 'mjb/master'
authorKeith Packard <keithp@keithp.com>
Thu, 30 Aug 2012 21:24:38 +0000 (16:24 -0500)
committerKeith Packard <keithp@keithp.com>
Thu, 30 Aug 2012 21:24:38 +0000 (16:24 -0500)

Trivial merge