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

[Simone Caronni]

commit 6e20c76301625f410f15407bd3d597da5598bea1
Merge: 819d0fc 8a7e202
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jun 4 12:34:43 2012 +0200

    Merge branch 'master' into f17

 bacula.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---