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

[Simone Caronni]

commit 42b9bd2dc48f58e923d2d8a0ce813a1048e5b4d0
Merge: c25b964 bf11b44
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Jun 19 14:59:39 2012 +0200

    Merge branch 'master' into f17

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