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

[Simone Caronni]

commit c9f767104f9769389fa5f4704dd367d3259fa860
Merge: 377a37e fa942d0
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu May 16 11:45:20 2013 +0200

    Merge branch 'master' into f17

 bacula.spec |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)
---