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

[Simone Caronni]

commit 73b4d5d1c6c0bcfb124d5272c0dbd9050b528bef
Merge: 36b251b ba4f327
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Jun 12 12:23:22 2012 +0200

    Merge branch 'master' into f17

 .gitignore                         |    1 +
 bacula-5.2.8-restore-termlib.patch |   80 ------------------------------------
 bacula.spec                        |    9 ++--
 sources                            |    2 +-
 4 files changed, 7 insertions(+), 85 deletions(-)
---