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

[Simone Caronni]

commit 1e5c71d7d6f430c5f734daac303166fc971d524f
Merge: 8f06455 70dfbe2
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Jun 19 11:55:30 2012 +0200

    Merge branch 'master' into f17

 bacula-dir.init |   39 ---------------------------------------
 bacula-sd.init  |   39 ---------------------------------------
 2 files changed, 0 insertions(+), 78 deletions(-)
---