Merge branch 'master' into pwmin-new pwmin-new 1.1.9.1
authorKeith Packard <keithp@keithp.com>
Thu, 18 Oct 2012 23:49:28 +0000 (16:49 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 18 Oct 2012 23:49:28 +0000 (16:49 -0700)

Trivial merge