[lzop/el4/master] (21 commits) ...Merge remote branch 'origin/master' into el4