Merge remote-tracking branch 'mjb/master'
authorKeith Packard <keithp@keithp.com>
Thu, 7 Mar 2013 05:53:22 +0000 (21:53 -0800)
committerKeith Packard <keithp@keithp.com>
Thu, 7 Mar 2013 05:53:22 +0000 (21:53 -0800)

Trivial merge