From: Keith Packard <keithp@keithp.com>
Date: Sat, 2 Nov 2013 10:24:38 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: telelco-v3.0~824
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=89a295337d41fec476ea636b8ca07b9ad288325d;p=hw%2Faltusmetrum

Merge remote-tracking branch 'origin/master'

Signed-off-by: Keith Packard <keithp@keithp.com>

Conflicts:
	packages/Makefile
---

89a295337d41fec476ea636b8ca07b9ad288325d