Merge branch 'master' of ssh://git.fluxo.info:2208/puppet-nodo

Conflicts:
	manifests/subsystems/utils/debian.pp

diff --cc manifests/subsystems/utils/debian.pp
index c38b50e74889b11e2eb152f8eb7838a44fe4eaa9,5f48aeb2c9d546b0afcef5dea4bbd39f51d3ec8a..e31011b7ddf7104f3766755b76e73b501cbaa3c3
--- 1/manifests/subsystems/utils/debian.pp
--- 2/manifests/subsystems/utils/debian.pp
+++ b/manifests/subsystems/utils/debian.pp
@@@ -53,11 -53,11 +53,11 @@@ class utils::personal::debian 
    }
  
    # Development
--  package { [ 'debhelper',  'gitk',      'git-gui',         'subversion',   'python-stdeb',
--              'fakeroot',   'dupload',   'autotools-dev',   'dh-make',      'doxygen',
--              'tig',        'mercurial', 'exuberant-ctags', 'reportbug',    'debian-keyring',
--              'devscripts', 'pbuilder',  'build-essential', 'pnopaste-cli', 'agave',
-               'quilt' ]:
 -              'cdbs',       'dh-buildinfo' ]:
++  package { [ 'debhelper',  'gitk',         'git-gui',         'subversion',   'python-stdeb',
++              'fakeroot',   'dupload',      'autotools-dev',   'dh-make',      'doxygen',
++              'tig',        'mercurial',    'exuberant-ctags', 'reportbug',    'debian-keyring',
++              'devscripts', 'pbuilder',     'build-essential', 'pnopaste-cli', 'agave',
++              'cdbs',       'dh-buildinfo', 'quilt' ]:
      ensure => installed,
    }