Merge branch 'master' into gi
authorMike Gorse <mgorse@novell.com>
Mon, 8 Nov 2010 21:40:54 +0000 (16:40 -0500)
committerMike Gorse <mgorse@novell.com>
Mon, 8 Nov 2010 21:40:54 +0000 (16:40 -0500)
1  2 
configure.ac

diff --cc configure.ac
Simple merge