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

[Simone Caronni]

commit 819d0fc48ee525efb5d8aaa5581c5dcac2e06d29
Merge: 18e76ed 7853da9
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jun 4 11:44:53 2012 +0200

    Merge branch 'master' into f17

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---