Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Tue, 3 Jul 2012 07:28:26 +0000 (00:28 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 3 Jul 2012 07:28:26 +0000 (00:28 -0700)

Trivial merge