Merge remote branch 'origin/buttonbox' into buttonbox
authorKeith Packard <keithp@keithp.com>
Tue, 23 Nov 2010 00:02:22 +0000 (16:02 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 23 Nov 2010 00:02:22 +0000 (16:02 -0800)

Trivial merge