Merge remote-tracking branch 'alanc/master'
authorKeith Packard <keithp@keithp.com>
Tue, 23 Jul 2013 03:34:41 +0000 (20:34 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 23 Jul 2013 03:34:41 +0000 (20:34 -0700)

Trivial merge