merge from trunk
authorJoakim Verona <joakim@verona.se>
Sat, 3 Apr 2010 20:21:58 +0000 (22:21 +0200)
committerJoakim Verona <joakim@verona.se>
Sat, 3 Apr 2010 20:21:58 +0000 (22:21 +0200)
1  2 
configure
configure.in
src/Makefile.in

diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/Makefile.in
Simple merge