Merge remote branch 'jamey/cleanups'
authorKeith Packard <keithp@keithp.com>
Fri, 14 May 2010 01:22:49 +0000 (18:22 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 14 May 2010 01:22:49 +0000 (18:22 -0700)
commit795432d4a92ed5b9fa4d9163e73c8e4fe4c74534
tree8bdcc020ca5ff5d5eef28f9acfb365daef1b8bde
parentf2a0c324e37c9fa3eb9087adbf963addb7f21d88
parent92ed75ac59e2d3af149cddb962efd05fc8487750
Merge remote branch 'jamey/cleanups'