[bacula/f17: 2/2] Merge branch 'master' into f17

[Simone Caronni]

commit 54a15143848b5950d65b3f931d145564b97b83f9
Merge: d3cce84 9dc3c9b
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jun 4 18:25:44 2012 +0200

    Merge branch 'master' into f17

 bacula-dir.sysconfig |    6 +++++-
 bacula-fd.sysconfig  |   11 ++++++++++-
 bacula-sd.sysconfig  |    4 ++++
 3 files changed, 19 insertions(+), 2 deletions(-)
---