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

[Simone Caronni]

commit a3c6e9665851358357274eb8dd3af566cd223ed6
Merge: 8d5ca38 3939b2b
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Jul 10 14:47:10 2012 +0200

    Merge branch 'master' into f17

 bacula-5.2.10-bsmtp.patch |  148 +++++++++++++++++++++++++++++++++++++++++++++
 bacula.spec               |    5 +-
 2 files changed, 152 insertions(+), 1 deletions(-)
---