branch merge
authorAnselm R Garbe <garbeam@gmail.com>
Tue, 17 Jun 2008 10:20:18 +0000 (11:20 +0100)
committerAnselm R Garbe <garbeam@gmail.com>
Tue, 17 Jun 2008 10:20:18 +0000 (11:20 +0100)
1  2 
config.def.h

diff --cc config.def.h
Simple merge