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

[Simone Caronni]

commit 8d5ca3850156165f2df8568536a23a144c6a55c0
Merge: 33cdd70 217785f
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Jul 10 14:36:47 2012 +0200

    Merge branch 'master' into f17

 bacula-dir.service |    4 ++--
 bacula-fd.service  |    4 ++--
 bacula-sd.service  |    4 ++--
 bacula.spec        |    5 ++++-
 4 files changed, 10 insertions(+), 7 deletions(-)
---