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

[Simone Caronni]

commit d13ab086f2864478553e065f1259b38e92c343f0
Merge: ab6069f c0772e3
Author: Simone Caronni <slaanesh at 3zpc0560.n0cosa.emac.cat.com>
Date:   Tue May 28 15:01:06 2013 +0200

    Merge branch 'master' into f17

 bacula-non-free-code.patch |  686 ++++++++++++++++++++++++++++++++++++++++++++
 bacula.spec                |    7 +-
 2 files changed, 692 insertions(+), 1 deletions(-)
---