Merge remote branch 'aj/master'
authorKeith Packard <keithp@keithp.com>
Tue, 28 Sep 2010 05:28:07 +0000 (22:28 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 28 Sep 2010 05:28:07 +0000 (22:28 -0700)

Trivial merge