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

[Simone Caronni]

commit e83661c874e7b75fe14693bb96235f09aed93e14
Merge: 8d44efe fa942d0
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu May 16 11:45:18 2013 +0200

    Merge branch 'master' into f18

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