[bucardo/f13: 3/3] Merge branch 'master' into f13

[Itamar Reis Peixoto]

commit bca378815a967b87fb785371898c6e8c70a7b27b
Merge: 19bda46 cf6cce6
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date:   Sun Jun 19 17:20:23 2011 -0300

    Merge branch 'master' into f13

 .gitignore   |    2 ++
 bucardo.spec |    5 ++++-
 sources      |    3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)
---