trunk merge
branch merge
Trunk merge.
mergtopolis
Fix compilation of dynload_shlib.c to reflect new cflags variables.