Merge branch 'master' into v4.7.x
authorArun Persaud <arun@nubati.net>
Fri, 15 Feb 2013 01:29:51 +0000 (17:29 -0800)
committerArun Persaud <arun@nubati.net>
Fri, 15 Feb 2013 01:29:51 +0000 (17:29 -0800)
1  2 
configure.ac

diff --cc configure.ac
Simple merge