Merge commit '6ea59dc2d8887102bfd8d7c838d2e7ab17645aec'
authorKeith Packard <keithp@keithp.com>
Tue, 5 Mar 2013 05:09:59 +0000 (21:09 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 5 Mar 2013 05:09:59 +0000 (21:09 -0800)

Trivial merge