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

[Simone Caronni]

commit 18e76ed69b3d6db8cee22655f2bdc82afaa43929
Merge: 248d9bd 4c56045
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jun 4 11:40:57 2012 +0200

    Merge branch 'master' into f17

 bacula-5.2.6-hostname.patch      |   62 ------
 bacula-5.2.6-python-detect.patch |   24 ---
 bacula-5.2.6-xattr.patch         |   11 -
 bacula.spec                      |  399 +++++++++++++++++++-------------------
 4 files changed, 197 insertions(+), 299 deletions(-)
---