From: Keith Packard <keithp@keithp.com>
Date: Fri, 7 Oct 2011 14:34:59 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/master' into multiarch
X-Git-Tag: 1.0.9.1~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=1c344b760776cd5d8c0297d8db9bf02687381b4e;hp=-c

Merge remote-tracking branch 'origin/master' into multiarch

Conflicts:
	configure.ac

Fix version number and location of ao.h header
---

1c344b760776cd5d8c0297d8db9bf02687381b4e