Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 27 Sep 2011 06:35:26 +0000 (14:35 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 27 Sep 2011 06:35:26 +0000 (14:35 +0800)
1  2 
configure.ac

diff --cc configure.ac
Simple merge