Merge remote branch 'aj/buttonbox' into buttonbox
authorKeith Packard <keithp@keithp.com>
Thu, 11 Nov 2010 06:11:21 +0000 (22:11 -0800)
committerKeith Packard <keithp@keithp.com>
Thu, 11 Nov 2010 06:11:21 +0000 (22:11 -0800)

Trivial merge