Merge branch 'lpc'
authorKeith Packard <keithp@keithp.com>
Tue, 21 May 2013 18:16:54 +0000 (11:16 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 21 May 2013 18:16:54 +0000 (11:16 -0700)

Trivial merge