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

[Simone Caronni]

commit 0135cd15f6ce4e249d7021a6346ad6956616586d
Merge: 3f8cb00 afcc566
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jun 8 10:13:23 2012 +0200

    Merge branch 'master' into f17

 bacula-sd.sysconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---