Upstream version 2.0+20040626