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

[Simone Caronni]

commit 36b251b8c8f86ec38858348f0dbe9b701283c152
Merge: 39bad80 cd32a5c
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jun 11 14:51:25 2012 +0200

    Merge branch 'master' into f17

 bacula-5.2.8-restore-termlib.patch |   80 ++++++++++++++++++++++++++++++++++++
 bacula.spec                        |    7 +++-
 2 files changed, 86 insertions(+), 1 deletions(-)
---