Merge branch 'master' into lpc
authorKeith Packard <keithp@keithp.com>
Mon, 20 May 2013 03:40:42 +0000 (20:40 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 20 May 2013 03:40:42 +0000 (20:40 -0700)

Trivial merge