Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sun, 30 Nov 2008 20:15:29 +0000 (21:15 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 30 Nov 2008 20:15:29 +0000 (21:15 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge