stuff
Merge branch 'cristian' of github.com:PCD/nel