Merge branch 'master' into gi
authorMike Gorse <mgorse@novell.com>
Tue, 26 Oct 2010 14:27:21 +0000 (10:27 -0400)
committerMike Gorse <mgorse@novell.com>
Tue, 26 Oct 2010 14:27:21 +0000 (10:27 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge