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

[Simone Caronni]

commit 377a37eefee793650f839d9d9c087453a4dac4b6
Merge: 4619d22 49b59b7
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu May 16 11:00:35 2013 +0200

    Merge branch 'master' into f17

 bacula.spec |  345 ++++++++++++++++++++++++++---------------------------------
 1 files changed, 154 insertions(+), 191 deletions(-)
---