Merge branch 'master' into split-library
authorKeith Packard <keithp@keithp.com>
Thu, 5 Jan 2012 04:19:32 +0000 (20:19 -0800)
committerKeith Packard <keithp@keithp.com>
Thu, 5 Jan 2012 04:19:32 +0000 (20:19 -0800)

Trivial merge