Merge remote-tracking branch 'origin/master' into multiarch
authorKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:34:59 +0000 (08:34 -0600)
committerKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:34:59 +0000 (08:34 -0600)
commit1c344b760776cd5d8c0297d8db9bf02687381b4e
treefb0e111268f64cce5ae96ebe0d618768eb6edf31
parent4ed53ef838afd4e922deb1c721a311974527525a
parentfc4173ff882dd9718f34ed043276ef612783dfe0
Merge remote-tracking branch 'origin/master' into multiarch

Conflicts:
configure.ac

Fix version number and location of ao.h header