From: Keith Packard <keithp@keithp.com>
Date: Wed, 9 Apr 2014 04:11:46 +0000 (-0700)
Subject: Merge branch 'master' into keith-bits
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=92874d104eea09247e42195f290e901f892e5cd7;hp=-c;p=hw%2Ftelemini

Merge branch 'master' into keith-bits

Replaces bdale's changes with mine
---

92874d104eea09247e42195f290e901f892e5cd7