Merge branch 'darcs' into master
commitc9fbd3173c88afe05212d44b19889a9e2c5ff2b2
authorBertram Felgenhauer <int-e@gmx.de>
Sat, 8 Nov 2008 19:14:02 +0000 (8 20:14 +0100)
committerBertram Felgenhauer <int-e@gmx.de>
Sat, 8 Nov 2008 19:14:02 +0000 (8 20:14 +0100)
tree022b2b07a086686b2f7a203b2d9261712eb90827
parentfbd343ec32f37fe73daf16b0fa716f716d06d0f4
parentf68ec63e3ed497ad48dc93248c3b70c3f6c9973e
Merge branch 'darcs' into master

Conflicts:
GNUmakefile -- trivial (source directories are collected
   differently now)
GNUmakefile