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

[Simone Caronni]

commit 8f06455dcc2444cfab4cc7cc878d5293c8c92eb6
Merge: 73b4d5d fce586b
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Jun 19 11:47:03 2012 +0200

    Merge branch 'master' into f17

 bacula.spec |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)
---