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

[Simone Caronni]

commit a43e9501414a17dad0a3aac82cf92ce25cd9a730
Merge: 41fc987 3a48a27
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jun 11 11:39:00 2012 +0200

    Merge branch 'master' into f17

 .gitignore       |    1 +
 bacula-docs.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---