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

[Simone Caronni]

commit 33cdd70e64c0b1cce7c014568d00d93914d04542
Merge: 42b9bd2 1bd589a
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jul 2 09:07:14 2012 +0200

    Merge branch 'master' into f17

 .gitignore  |    1 +
 bacula.spec |    7 +++++--
 sources     |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---