Merge commit 'pubserv/master'
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 31 Aug 2007 01:25:38 +0000 (03:25 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 31 Aug 2007 01:25:38 +0000 (03:25 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge