Upstream version 2.0+20060928