Merge branch 'micropeak-1.1'
authorKeith Packard <keithp@keithp.com>
Sat, 15 Dec 2012 03:29:50 +0000 (19:29 -0800)
committerKeith Packard <keithp@keithp.com>
Sat, 15 Dec 2012 03:29:50 +0000 (19:29 -0800)

Trivial merge