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

[Simone Caronni]

commit 5ded397be3d8880f75881311024e88b00d14cb32
Merge: 3f2b628 217530f
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jul 16 11:09:01 2012 +0200

    Merge branch 'master' into f17

 bacula.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---