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

[Simone Caronni]

commit 1207766741753d7df55a19393e36324e8b8fe7c0
Merge: b5ee7c3 ae65061
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Jul 19 14:19:05 2012 +0200

    Merge branch 'master' into f17

 bacula-docs.spec |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)
---