Merge changes from trunk to fix issues in 0.2.4

svn path=/branches/gentoolkit-0.2.4/; revision=557

diff --cc ChangeLog
Simple merge

diff --cc src/echangelog/echangelog
index 1a4bee7527d49cddcfe8855a6b825cd8071af7ef,fea1af67c67eb948f86ca4236ee443b8444dee8b..fea1af67c67eb948f86ca4236ee443b8444dee8b
mode 100644,100755..100755
--- 1/src/echangelog/echangelog
--- 2/trunk/src/echangelog/echangelog
+++ b/src/echangelog/echangelog

diff --cc src/echangelog/echangelog.1
Simple merge

diff --cc src/echangelog/test/TEST.pm
index 0000000000000000000000000000000000000000,6632148e8bb0812d5edbaeaac6edbe7ac936f928..6632148e8bb0812d5edbaeaac6edbe7ac936f928
mode 000000,100644..100644
--- /dev/null
--- 2/trunk/src/echangelog/test/TEST.pm
+++ b/src/echangelog/test/TEST.pm

diff --cc src/echangelog/test/templates/test.patch
index 0000000000000000000000000000000000000000,72d46fa2a36c971cdd76d76d492323f22ac3a9ff..72d46fa2a36c971cdd76d76d492323f22ac3a9ff
mode 000000,100644..100644
--- /dev/null
--- 2/trunk/src/echangelog/test/templates/test.patch
+++ b/src/echangelog/test/templates/test.patch

diff --cc src/echangelog/test/templates/vcstest-0.0.1.ebuild
index 0000000000000000000000000000000000000000,2824b836209440613d76d6dde60aacec47fc5f3b..2824b836209440613d76d6dde60aacec47fc5f3b
mode 000000,100644..100644
--- /dev/null
--- 2/trunk/src/echangelog/test/templates/vcstest-0.0.1.ebuild
+++ b/src/echangelog/test/templates/vcstest-0.0.1.ebuild

diff --cc src/echangelog/test/test.sh
index 0000000000000000000000000000000000000000,374522f6465c94a3232c52a8fd7624b9faac9655..374522f6465c94a3232c52a8fd7624b9faac9655
mode 000000,100755..100755
--- /dev/null
--- 2/trunk/src/echangelog/test/test.sh
+++ b/src/echangelog/test/test.sh

diff --cc src/ekeyword/ChangeLog
Simple merge

diff --cc src/ekeyword/ekeyword
index e75ce933f4ff8a7f981f5e4ee6defa7c493e802f,2e49ac0bbfe1954a2a7728c0747e432d50667992..2e49ac0bbfe1954a2a7728c0747e432d50667992
mode 100644,100755..100755
--- 1/src/ekeyword/ekeyword
--- 2/trunk/src/ekeyword/ekeyword
+++ b/src/ekeyword/ekeyword

diff --cc src/equery/equery
Simple merge

diff --cc src/gentoolkit/helpers.py
Simple merge

diff --cc src/gentoolkit/package.py
Simple merge

diff --cc src/gentoolkit/pprinter.py
Simple merge

diff --cc src/glsa-check/glsa-check
index 98e5708154ff7450e897527502aedb15ec951126,efb9e913338af8584301273a8139cc801b6d6116..efb9e913338af8584301273a8139cc801b6d6116
mode 100644,100755..100755
--- 1/src/glsa-check/glsa-check
--- 2/trunk/src/glsa-check/glsa-check
+++ b/src/glsa-check/glsa-check

diff --cc src/revdep-rebuild/revdep-rebuild
Simple merge

diff --cc src/revdep-rebuild/revdep-rebuild.1
Simple merge