Conflicts: setup.py software/drupal/settings.php.in software/drupal/software.cfg stack/lamp/buildout.cfg
