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

[Simone Caronni]

commit 39bad80c64f89847157da01a2d9060d11b502336
Merge: e0332d3 bc0df25
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jun 11 11:31:32 2012 +0200

    Merge branch 'master' into f17

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