Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 22 Sep 2013 00:12:29 +0000 (02:12 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 22 Sep 2013 00:12:29 +0000 (02:12 +0200)
This incoporates a couple of important bug fixes found at athcx.

1  2 
configure.ac

diff --cc configure.ac
Simple merge