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

[Simone Caronni]

commit c25b96419394530d6e1e3bee9df311ed89484078
Merge: 1e5c71d 940ac99
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Jun 19 11:59:01 2012 +0200

    Merge branch 'master' into f17

 bacula-dir.init |    4 +---
 bacula-fd.init  |    4 +---
 bacula-sd.init  |    4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)
---