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

[Simone Caronni]

commit e4677058cb2ac9d30ffdc9fc43b7ec10249dfdb9
Merge: 497f32c 69ae2fe
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon May 21 17:47:56 2012 +0200

    Merge branch 'master' into f17

 bacula-docs.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---