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

[Simone Caronni]

commit f7a2a7bef36acb0f3af038603b0c54f86a47ccdf
Merge: a3c6e96 6ddbf50
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jul 16 10:59:23 2012 +0200

    Merge branch 'master' into f17

 bacula-5.2.10-log-path.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 bacula-5.2.4-log-path.patch  |   29 -----------------------------
 bacula.spec                  |    5 ++++-
 3 files changed, 45 insertions(+), 30 deletions(-)
---