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

[Simone Caronni]

commit 585615b1abbafde32bfe7c146e9cf5b5d99703ef
Merge: 5ded397 8f6eee7
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Jul 19 14:08:44 2012 +0200

    Merge branch 'master' into f17

 bacula.spec |   96 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 49 insertions(+), 47 deletions(-)
---