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

[Simone Caronni]

commit e9302ec13d028069b6da1da538acc908523feff8
Merge: 8b9bd00 27dc4d4
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Apr 19 18:27:39 2013 +0200

    Merge branch 'master' into f17

 bacula-docs-aarch64.patch | 2549 +++++++++++++++++++++++++++++++++++++++++++++
 bacula-docs.spec          |    7 +-
 2 files changed, 2555 insertions(+), 1 deletions(-)
---