Merge branch 'master' into pwmin
authorKeith Packard <keithp@keithp.com>
Fri, 20 Jul 2012 19:08:55 +0000 (12:08 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 20 Jul 2012 19:08:55 +0000 (12:08 -0700)

Trivial merge