Conflicts: scripts/builder/repository.py Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>