autoconf
merge trunk
merge release