Conflicts:
	aconversions/src/re2fa/Brzozowski.cpp
	libaderivation/src/RegExpDerivation.cpp
	libaregexptree/src/RegExpAlphabet.cpp

Conflicts:
	aconversions/src/re2fa/Brzozowski.cpp
	aderivation/src/aderivation.cpp
	aintegral/src/aintegral.cpp
	libaderivation/src/RegExpDerivation.cpp
	libaderivation/src/RegExpDerivation.h
	libaderivation/src/RegExpIntegral.cpp
	libaderivation/src/RegExpIntegral.h
	libaregexptree/src/RegExpOptimize.cpp

Conflicts:
	aconversions/src/re2fa/Brzozowski.cpp
	libaderivation/src/RegExpDerivation.cpp
	libaregexptree/src/RegExpAlphabet.cpp

Conflicts:
	alib/src/regexp/Alternation.cpp
	alib/src/regexp/Alternation.h
	alib/src/regexp/Concatenation.cpp
	alib/src/regexp/Concatenation.h
	alib/src/regexp/Iteration.cpp
	alib/src/regexp/Iteration.h
	alib/src/regexp/RegExpElement.h
	alib/src/regexp/RegExpEmpty.cpp
	alib/src/regexp/RegExpEmpty.h
	alib/src/regexp/RegExpEpsilon.cpp
	alib/src/regexp/RegExpEpsilon.h
	alib/src/regexp/RegExpSymbol.cpp
	alib/src/regexp/RegExpSymbol.h

Conflicts:
	makefile

- Fix dependencies to allow parallel make (run with make -j4 for 4 threads)
- Add atrim to build list
- Add missing libxml2 includes