Merge branch 'master' into v4.6.x
authorArun Persaud <arun@nubati.net>
Fri, 10 Feb 2012 06:49:40 +0000 (22:49 -0800)
committerArun Persaud <arun@nubati.net>
Fri, 10 Feb 2012 06:49:40 +0000 (22:49 -0800)
1  2 
configure.ac

diff --cc configure.ac
Simple merge