Added a flags argument to the entry function.
The fixed function argument problem.
Fixed include directive to take advantage of the gnulib replacement.
Merge branch 'master' into abstract

Rerieving updates from upstream.