From: Keith Packard <keithp@keithp.com>
Date: Tue, 8 Oct 2013 16:26:41 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.2.9.4~57
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=488a527267decece48e6682e0e0c7fc29cbed329;hp=6a1e398e590121458176758858bb4210f3eb5a55

Merge remote-tracking branch 'origin/master'

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

Conflicts:
	configure.ac
---