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

[Simone Caronni]

commit 65d54149cf9ac4d35bb29df9b97e789b166e91fc
Merge: 54a1514 0d818a8
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jun 6 18:19:05 2012 +0200

    Merge branch 'master' into f17

 bacula-5.2.7-xattr.patch | 1170 ++++++++++++++++++++++++++++++++++++++++++++++
 bacula.spec              |    7 +-
 2 files changed, 1176 insertions(+), 1 deletions(-)
---