Merge pull request #2 from bareos/master

merge from bareos/bareos