Merge remote-tracking branch 'alanc/master'
authorKeith Packard <keithp@keithp.com>
Tue, 17 Jul 2012 19:17:39 +0000 (12:17 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 17 Jul 2012 19:17:39 +0000 (12:17 -0700)

Trivial merge