Merge branch 'master' into gsoc2010
authorAustin Burrow <atburrow@gmail.com>
Tue, 17 Aug 2010 07:16:21 +0000 (02:16 -0500)
committerAustin Burrow <atburrow@gmail.com>
Tue, 17 Aug 2010 07:16:21 +0000 (02:16 -0500)
1  2 
configure.ac
modules/LIST

diff --cc configure.ac
Simple merge
diff --cc modules/LIST
Simple merge