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

[Simone Caronni]

commit a55cd362939cf9d1deb2e3ec343c14a95bf93c6b
Merge: 65d5414 ac1739c
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jun 6 19:22:23 2012 +0200

    Merge branch 'master' into f17

 bacula.spec |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---